OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge 0ca1b4d676 into 50ac509a01

pull/28503/merge
Kim Brose 2025-01-08 13:13:49 +00:00 committed by GitHub
parent 50ac509a01 0ca1b4d676
commit 0a8c3bd0a3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/docker-package.sh
View File

@ -3,7 +3,6 @@
set -ex set -ex
BRANCH=$(git rev-parse --abbrev-ref HEAD) BRANCH=$(git rev-parse --abbrev-ref HEAD)
DIST_VERSION=$(git describe --abbrev=0 --tags)
DIR=$(dirname "$0") DIR=$(dirname "$0")
@ -13,6 +12,8 @@ DIR=$(dirname "$0")
if [[ $BRANCH != HEAD && ! $BRANCH =~ heads/v.+ ]] if [[ $BRANCH != HEAD && ! $BRANCH =~ heads/v.+ ]]
then then
DIST_VERSION=$("$DIR"/get-version-from-git.sh) DIST_VERSION=$("$DIR"/get-version-from-git.sh)
else
DIST_VERSION=$(git describe --abbrev=0 --tags)
fi fi
DIST_VERSION=$("$DIR"/normalize-version.sh "$DIST_VERSION") DIST_VERSION=$("$DIR"/normalize-version.sh "$DIST_VERSION")