Skip to content
Snippets Groups Projects
Commit d6c44bde authored by Nico's avatar Nico
Browse files

allow to specify gluon major

parent b7b41a42
No related branches found
No related tags found
No related merge requests found
...@@ -17,5 +17,5 @@ build: ...@@ -17,5 +17,5 @@ build:
- mkdir -p ~/.ssh - mkdir -p ~/.ssh
- cat gitlab-known-hosts >> ~/.ssh/known_hosts - cat gitlab-known-hosts >> ~/.ssh/known_hosts
script: script:
- ./update-gluon.sh - ./update-gluon.sh "$GLUON_MAJOR_VERSION"
cache: {} cache: {}
...@@ -4,11 +4,17 @@ set -x ...@@ -4,11 +4,17 @@ set -x
set -eu set -eu
set -o pipefail set -o pipefail
gluon_major_version="${1:-}"
if [ -z "$gluon_major_version" ]; then
echo "usage: $0 <gluon major version>" >&2
exit 1
fi
gluon_fork_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/nrb/gluon-test.git" gluon_fork_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/nrb/gluon-test.git"
gluon_upstream_git_url="https://github.com/freifunk-gluon/gluon.git" gluon_upstream_git_url="https://github.com/freifunk-gluon/gluon.git"
site_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/nrbffs/site-ffs.git" site_git_url="ssh://git@gitlab.freifunk-stuttgart.de:22220/nrbffs/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_version"* | cut -d/ -f3 | sort -r -n -t. -k2 | head -n1)
# branch name in our forked gluon # branch name in our forked gluon
fork_newest_minor_branch="$upstream_newest_minor-ffs" fork_newest_minor_branch="$upstream_newest_minor-ffs"
fork_newest_minor_tag="$upstream_newest_minor-ffs0.1" fork_newest_minor_tag="$upstream_newest_minor-ffs0.1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment