From afc8536d1c19b12c158c17cff97f66406b99057a Mon Sep 17 00:00:00 2001 From: Kim Brose <2803622+HarHarLinks@users.noreply.github.com> Date: Thu, 10 Apr 2025 07:59:44 +0000 Subject: [PATCH] Don't crash the build when trying to docker-package from a shallow clone of a commit (#28503) --- scripts/docker-package.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/docker-package.sh b/scripts/docker-package.sh index 0920587117..14444de556 100755 --- a/scripts/docker-package.sh +++ b/scripts/docker-package.sh @@ -3,7 +3,6 @@ set -ex BRANCH=$(git rev-parse --abbrev-ref HEAD) -DIST_VERSION=$(git describe --abbrev=0 --tags) DIR=$(dirname "$0") @@ -13,6 +12,8 @@ DIR=$(dirname "$0") if [[ $BRANCH != HEAD && ! $BRANCH =~ heads/v.+ ]] then DIST_VERSION=$("$DIR"/get-version-from-git.sh) +else + DIST_VERSION=$(git describe --abbrev=0 --tags) fi DIST_VERSION=$("$DIR"/normalize-version.sh "$DIST_VERSION")