aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrubo77 <github@r.z11.de>2018-04-23 11:50:32 +0200
committerrubo77 <github@r.z11.de>2018-04-23 11:50:32 +0200
commit8d16d9c328f39458cea876bc0f51d2b3955d4ffe (patch)
tree69d237c1bf6469b3522001ffd17554145593b29a
parent4a5beca2d257a66befdf04839591f046432be2f9 (diff)
version auf 2017.1.6 hochgezählt
-rwxr-xr-xmake-release.sh2
-rw-r--r--site.mk4
-rwxr-xr-xtests/validate_site.sh2
3 files changed, 4 insertions, 4 deletions
diff --git a/make-release.sh b/make-release.sh
index 4f7a0a1..b1cc02a 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -15,7 +15,7 @@ set -u
set -e
# if version is unset, will use the default nightly version from site.mk
-VERSION=${3:-"2017.1.5~ngly$(date '+%y%m%d%H%M')"}
+VERSION=${3:-"2017.1.6~ngly$(date '+%y%m%d%H%M')"}
# branch must be set to either rc, nightly or stable
BRANCH=${2:-"stable"}
# must point to valid ecdsa signing key created by ecdsakeygen, relative to Gluon base directory
diff --git a/site.mk b/site.mk
index 0836a8a..faed2af 100644
--- a/site.mk
+++ b/site.mk
@@ -53,8 +53,8 @@ GLUON_SITE_PACKAGES += \
# Always call `make` from the command line with the desired release version!
# otherwise this is generated:
-#DEFAULT_GLUON_RELEASE := 2017.1.5
-DEFAULT_GLUON_RELEASE := 2017.1.5~ngly$(shell date '+%y%m%d')
+#DEFAULT_GLUON_RELEASE := 2017.1.6
+DEFAULT_GLUON_RELEASE := 2017.1.6~ngly$(shell date '+%y%m%d')
# Allow overriding the release number from the command line
diff --git a/tests/validate_site.sh b/tests/validate_site.sh
index e08d760..d7d9018 100755
--- a/tests/validate_site.sh
+++ b/tests/validate_site.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# validate_site.sh checks if the site.conf is valid json
-GLUON_BRANCH='v2017.1.5'
+GLUON_BRANCH='v2017.1.x'
P=$(pwd)
echo "####### validating $P/site.conf ..."