aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrubo77 <github@r.z11.de>2018-07-23 11:31:52 +0200
committerrubo77 <github@r.z11.de>2018-07-23 11:31:52 +0200
commit4ae5542355df92c80626724c759fa429a9633803 (patch)
tree94560c2f3fa3a4e087c7143e27b1573fd91b0bc6
parent32392f44493aad4f83c67e056c2a1ee77603d3c9 (diff)
- bump due to "gluon-mesh-batman-adv: Drop IPv4 anycast related packets from/to bat0" a7a5db9f
- clarify the use of 2018.1.x
-rwxr-xr-xmake-release.sh2
-rw-r--r--release2
-rw-r--r--site.mk2
3 files changed, 3 insertions, 3 deletions
diff --git a/make-release.sh b/make-release.sh
index 17fd74b..9577542 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:-"2018.1~ngly$(date '+%y%m%d%H%M')"}
+VERSION=${3:-"2018.1.0~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/release b/release
index f4a79d7..b2a477e 100644
--- a/release
+++ b/release
@@ -1 +1 @@
-2018.1~ngly
+2018.1.0~ngly
diff --git a/site.mk b/site.mk
index c16fd66..76f4df5 100644
--- a/site.mk
+++ b/site.mk
@@ -57,7 +57,7 @@ GLUON_SITE_PACKAGES += \
# Always call `make` from the command line with the desired release version!
# otherwise this is generated:
#DEFAULT_GLUON_RELEASE := 2018.1
-DEFAULT_GLUON_RELEASE := 2018.1~ngly$(shell date '+%y%m%d')
+DEFAULT_GLUON_RELEASE := 2018.1.0~ngly$(shell date '+%y%m%d')
# Allow overriding the release number from the command line