v2019.1.x

and add debug information to README, how to check all lua files

.gitlab-ci.yml

@@ -3,7 +3,7 @@ variables:
   GIT_SSL_CAPATH: /etc/ssl/certs/
   CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/build
   GLUON_GIT: https://github.com/freifunk-gluon/gluon.git
-  GLUON_BRANCH: v2018.2.x
+  GLUON_BRANCH: v2019.1.x
   # set to '' or 'BROKEN=1'
   BROKEN: 'BROKEN=1'
   # set to '', 'V=s' or 'V=s BUILD_LOG=1'

README.md

-# Validation
-
-You can validate your changes to this repository by calling the validate_site.sh file with
-
-    tests/validate_site.sh
-
-# Dokumentation
+Firmware Site Config for Freifunk Nord
+--------------------------------------
 
+You can always find
+the latest gluon documentation at:
 https://gluon.readthedocs.org/en/latest/
 
 Gluon Version auf der die Freifunk Nord Firmware basiert:
 
-* 2018.2.0.3 - Gluon 2018.2.x
+* 2019.1 - Gluon v2019.1.x
 
 # Download der Firmware
 
@@ -80,12 +77,17 @@ Gluon Version auf der die Freifunk Nord Firmware basiert:
 
        make clean GLUON_TARGET=$TARGET
 
-## debug
+# Development
 
-you can debug lua scripts in modules with 
+## Validation and debug
+
+You can validate your changes to this repository by calling the validate_site.sh file with
+
+    tests/validate_site.sh
+
+You can debug lua scripts in modules with 
 
     apt install luarocks
     luarocks install --local luacheck
     tests/validate_site.sh
     ~/.luarocks/bin/luacheck --config "tests/.luacheckrc" /tmp/site-validate/|grep "(E"
-

make-release.sh

@@ -15,7 +15,7 @@ set -u
 set -e
 
 # if version is unset, will use the default version from site.mk
-VERSION=${3:-"2019.2.0~exp$(date '+%y%m%d%H%M')"}
+VERSION=${3:-"2019.1~exp$(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

release

-2019.2.0-BUILD
+2019.1-BUILD

site.mk

@@ -3,7 +3,7 @@
 # Always call `make` from the command line with the desired release version!
 # otherwise this is generated:
 #DEFAULT_GLUON_RELEASE := 2018.2.1
-DEFAULT_GLUON_RELEASE := 2019.2.0~exp$(shell date '+%y%m%d')
+DEFAULT_GLUON_RELEASE := 2019.1~exp$(shell date '+%y%m%d')
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)

tests/validate_site.sh

@@ -3,9 +3,9 @@ set -uo pipefail
 
 # validate_site.sh checks if the site.conf is valid json
 GLUON_REPO="https://github.com/freifunk-gluon/gluon"
-GLUON_BRANCH='v2018.2.x'
+GLUON_BRANCH='v2019.1.x'
 GLUON_PACKAGES_REPO="https://github.com/freifunk-gluon/packages"
-GLUON_PACKAGES_BRANCH='master'
+GLUON_PACKAGES_BRANCH='v2019.1.x'
 
 P="$(pwd)"
 echo "####### check if lua5.1 is installed ..."
@@ -74,7 +74,7 @@ for feed in $GLUON_SITE_FEEDS; do
   cd -
 done
 
-echo "####### Lua linter check fo all package feeds ..."
+echo "####### Lua linter check for all package feeds ..."
 ~/.luarocks/bin/luacheck --config "$P/tests/.luacheckrc" "$testpath/packages"
 
 echo "####### downloading $GLUON_PACKAGES_REPO ..."