particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tools/appsre-build-worker-packer: Fix branch parsing on jenkins

Browse source
This commit is contained in:
sanne 2022-01-19 11:14:50 +01:00 • committed by Sanne Raymaekers
parent 8a8ed14319
commit 6b716a4bbc
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tools/appsre-build-worker-packer.sh
View file

@ -7,13 +7,16 @@ COMMIT_SHA=$(git rev-parse HEAD)
COMMIT_BRANCH=$(git rev-parse --abbrev-ref HEAD) COMMIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
ON_JENKINS=true ON_JENKINS=true
# Use CI variables if available # Use gitlab CI variables if available
if [ -n "$CI_COMMIT_SHA" ]; then if [ -n "$CI_COMMIT_SHA" ]; then
ON_JENKINS=false ON_JENKINS=false
COMMIT_SHA="$CI_COMMIT_SHA" COMMIT_SHA="$CI_COMMIT_SHA"
fi fi
if [ -n "$CI_COMMIT_BRANCH" ]; then if [ -n "$CI_COMMIT_BRANCH" ]; then
COMMIT_BRANCH="$CI_COMMIT_BRANCH" COMMIT_BRANCH="$CI_COMMIT_BRANCH"
elif [ -n "$GIT_BRANCH" ]; then
# Use jenkins CI variables if available
COMMIT_BRANCH="${GIT_BRANCH#*/}"
fi fi
if [ "$ON_JENKINS" = false ]; then if [ "$ON_JENKINS" = false ]; then