PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix if condition for deciding how to structure docker version file (#23186)

Browse source
This commit is contained in:
Michael Telatynski 2022-09-05 09:35:16 +01:00 committed by GitHub
parent 351d5faa9b
commit ae2c163441
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/docker-package.sh
View file

@ -7,8 +7,10 @@ DIST_VERSION=$(git describe --abbrev=0 --tags)
DIR=$(dirname "$0") DIR=$(dirname "$0")
# If we're not using custom SDKs and on a branch other than master, generate a version akin go develop.element.io # If the branch comes out as HEAD then we're probably checked out to a tag, so if the thing is *not*
if [[ $USE_CUSTOM_SDKS == false ]] && [[ $BRANCH != 'master' ]] # coming out as HEAD then we're on a branch. When we're on a branch, we want to resolve ourselves to
# a few SHAs rather than a version.
if [[ $BRANCH != HEAD && ! $BRANCH =~ heads/v.+ ]]
then then
DIST_VERSION=$("$DIR"/get-version-from-git.sh) DIST_VERSION=$("$DIR"/get-version-from-git.sh)
fi fi