From: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- gitlab/build-crosstest | 2 +- gitlab/build-linux | 2 +- gitlab/build-mac | 2 +- gitlab/build-mingw | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest index 7963e58bf..24d25dd49 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 master HEAD^ | wc -l) $(git rev-parse --short HEAD)) set -Eeuxo pipefail diff --git a/gitlab/build-linux b/gitlab/build-linux index 318bbba44..6af99092e 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 master HEAD^ | wc -l) $(git rev-parse --short HEAD)) set -Eeuxo pipefail diff --git a/gitlab/build-mac b/gitlab/build-mac index ffa46d67f..fc8cbca72 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 master HEAD^ | wc -l) $(git rev-parse --short HEAD)) set -Eeuxo pipefail diff --git a/gitlab/build-mingw b/gitlab/build-mingw index 80281de75..f3002b087 100755 --- a/gitlab/build-mingw +++ b/gitlab/build-mingw @@ -3,7 +3,7 @@ echo "Building $(git log -1)" echo "---" -COMMIT=$(git rev-parse --short HEAD) +COMMIT=$(printf '%03d-%s' $(git cherry master HEAD^ | wc -l) $(git rev-parse --short HEAD)) set -Eeuxo pipefail -- GitLab https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/362