aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrubo77 <github@r.z11.de>2018-05-01 00:43:16 +0200
committerrubo77 <github@r.z11.de>2018-05-01 00:43:16 +0200
commite6dd852bae258738e09b089ee442952a710134f5 (patch)
treefd5313ca29255ccb922a5d88e5b83c42f5cc995c
parent8d16d9c328f39458cea876bc0f51d2b3955d4ffe (diff)
version auf 2017.1.7 hochgezählt
-rw-r--r--CHANGELOG.md4
-rwxr-xr-xmake-release.sh2
-rw-r--r--site.mk4
3 files changed, 6 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d49409d..ab6953b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-Änderungen mit Firmwareversion 2017.1.3 basierend auf Gluon 2017.1.3
+Änderungen mit Firmwareversion 2017.1.7 basierend auf Gluon 2017.1.7
====================================================================
Freifunk Kiel spezifische Änderungen:
@@ -17,6 +17,8 @@ Offizielle Changelogs zum nachlesen:
* https://gluon.readthedocs.io/en/latest/releases/v2017.1.3.html
* https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.4.html
* https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.5.html
+* https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.6.html
+* https://gluon.readthedocs.io/en/v2017.1.x/releases/v2017.1.7.html
<br>
diff --git a/make-release.sh b/make-release.sh
index b1cc02a..b51f3d6 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.6~ngly$(date '+%y%m%d%H%M')"}
+VERSION=${3:-"2017.1.7~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 faed2af..832d952 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.6
-DEFAULT_GLUON_RELEASE := 2017.1.6~ngly$(shell date '+%y%m%d')
+#DEFAULT_GLUON_RELEASE := 2017.1.7
+DEFAULT_GLUON_RELEASE := 2017.1.7~ngly$(shell date '+%y%m%d')
# Allow overriding the release number from the command line