From 77cbf95417af99d0fc667f9e1c5306cce0729db2 Mon Sep 17 00:00:00 2001
From: rubo77 <github@r.z11.de>
Date: Thu, 1 Dec 2016 23:09:02 +0100
Subject: [PATCH] 2016.2.1 Release Candidate
---
make-release.sh | 3 +--
site.mk | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/make-release.sh b/make-release.sh
index 16b5b1b..fb4870b 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 89a8624..725a3a7 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)
--
GitLab