diff --git a/make-release.sh b/make-release.sh index 16b5b1bba2818fc427a286a22b90c31cde8572d3..fb4870b75b6877ccb28b7ce838b29d9eb7d94b5e 100644 --- a/make-release.sh +++ b/make-release.sh @@ -10,7 +10,7 @@ ## properly configured in this script. # if version is unset, will use the default experimental version from site.mk -VERSION=${3:-"2016.2.1~exp$(date '+%y%m%d%H%M')"} +VERSION=${3:-"2016.2.1"} # branch must be set to either experimental, beta or stable BRANCH=${2:-"stable"} # must point to valid ecdsa signing key created by ecdsakeygen, relative to Gluon base directory @@ -101,5 +101,4 @@ then fi cd site date >> build.log -mv -v ../output/images "../output/$VERSION" echo "Done :)" diff --git a/site.mk b/site.mk index 89a862451c62065881f92210c4b1c022baefb6f2..725a3a773ac8b7c18bc6370f1b335a667d36450b 100644 --- a/site.mk +++ b/site.mk @@ -40,7 +40,7 @@ GLUON_SITE_PACKAGES += \ # Always call `make` from the command line with the desired release version! # otherwise this is generated: -DEFAULT_GLUON_RELEASE := 2016.2~exp$(shell date '+%y%m%d%H%M') +DEFAULT_GLUON_RELEASE := 2016.2.1 # Allow overriding the release number from the command line GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)