From: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- gitlab/build-crosstest | 2 +- gitlab/build-linux | 2 +- gitlab/build-mac | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest index 7963e58bf..5561bffb2 100755 --- a/gitlab/build-crosstest +++ b/gitlab/build-crosstest @@ -3,7 +3,7 @@ echo "Building $(git log -1)" echo "---" -COMMIT=$(git rev-parse --short HEAD) +COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) set -Eeuxo pipefail diff --git a/gitlab/build-linux b/gitlab/build-linux index 318bbba44..566d772f8 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -3,7 +3,7 @@ echo "Building $(git log -1)" echo "---" -COMMIT=$(git rev-parse --short HEAD) +COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) set -Eeuxo pipefail diff --git a/gitlab/build-mac b/gitlab/build-mac index ffa46d67f..23c1ea964 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -3,7 +3,7 @@ echo "Building $(git log -1)" echo "---" -COMMIT=$(git rev-parse --short HEAD) +COMMIT=$(printf '%03d-%s' $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)) set -Eeuxo pipefail -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/362