Giovanni Mascellani : ci: Prepend an ordinal number to commits in artifacts.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 7366b5fd38fa283ffa316839520f07e83febe21c
URL:    https://gitlab.winehq.org/wine/vkd3d/-/commit/7366b5fd38fa283ffa316839520f07...

Author: Giovanni Mascellani <gmascellani(a)codeweavers.com>
Date:   Tue Sep 26 23:03:31 2023 +0200

ci: Prepend an ordinal number to commits in artifacts.

---

 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 7963e58b..5561bffb 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 318bbba4..566d772f 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 ffa46d67..23c1ea96 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