Don't crash the build when trying to docker-package from a shallow clone of a commit (#28503)
This commit is contained in:
@@ -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")
|
||||||
|
|||||||
Reference in New Issue
Block a user