Fix version for Docker builds
This (should) fix the version script for Docker builds by testing the branch with a regex instead of single char glob. Fixes https://github.com/vector-im/riot-web/issues/12777pull/12799/head
parent
a9fbf2f968
commit
4afe7a73c4
|
@ -11,7 +11,7 @@ DIST_VERSION=$TAG
|
||||||
# a few SHAs rather than a version.
|
# a few SHAs rather than a version.
|
||||||
# Docker Hub doesn't always check out the tag and sometimes checks out the branch, so we should look
|
# Docker Hub doesn't always check out the tag and sometimes checks out the branch, so we should look
|
||||||
# for an appropriately tagged branch as well (heads/v1.2.3).
|
# for an appropriately tagged branch as well (heads/v1.2.3).
|
||||||
if [[ $BRANCH != 'HEAD' && $BRANCH != 'heads/v*' ]]
|
if [[ $BRANCH != HEAD && ! $BRANCH =~ heads/v.+ ]]
|
||||||
then
|
then
|
||||||
REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
|
REACT_SHA=$(cd node_modules/matrix-react-sdk; git rev-parse --short=12 HEAD)
|
||||||
JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
|
JSSDK_SHA=$(cd node_modules/matrix-js-sdk; git rev-parse --short=12 HEAD)
|
||||||
|
|
Loading…
Reference in New Issue