diff --git a/update-gluon.sh b/update-gluon.sh index 93d2123217b5a08cb66cda60459ef1af67689eb9..a8011c8cb08a88bf82b8e4bb4fe8c703800c6edc 100755 --- a/update-gluon.sh +++ b/update-gluon.sh @@ -4,11 +4,13 @@ set -x set -eu set -o pipefail +gluon_major="v2019.1" + gluon_fork_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/firmware/gluon.git" gluon_upstream_git_url="https://github.com/freifunk-gluon/gluon.git" site_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/firmware/site-ffs.git" -upstream_newest_minor=$(git ls-remote --tags --refs "$gluon_upstream_git_url" 'refs/tags/v2018.2*' | cut -d/ -f3 | sort -r -n -t. -k2 | head -n1) +upstream_newest_minor=$(git ls-remote --tags --refs "$gluon_upstream_git_url" "refs/tags/$gluon_major\*" | cut -d/ -f3 | sort -r -n -t. -k2 | head -n1) # branch name in our forked gluon fork_newest_minor_branch="$upstream_newest_minor-ffs" fork_newest_minor_tag="$upstream_newest_minor-ffs0.1" @@ -38,7 +40,7 @@ cd .. git clone --recurse "$site_git_url" cd site-ffs -git checkout nightly +git checkout "gluon-$gluon_major" git submodule sync git submodule update