[PATCH v5 0/2] MR362: ci: Build vkd3d with MinGW too.

[Giovanni Mascellani (＠giomasce)]

--
  v5: ci: Prepend an ordinal number to commits in artifacts.
      ci: Build vkd3d with MinGW too.

https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/362

[PATCH v5 1/2] ci: Build vkd3d with MinGW too.

[Giovanni Mascellani]

From: Giovanni Mascellani

Nowadays vkd3d is probably most commonly used compiled as PE rather then
ELF, so it makes sense to at least ensure that compilation succeeds.
In the future it would be nice to somehow test these binaries as well.
---
 gitlab/build-mingw | 24 ++++++++++++++++++++++++
 gitlab/build.yml   | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100755 gitlab/build-mingw

diff --git a/gitlab/build-mingw b/gitlab/build-mingw
new file mode 100755
index 000000000..80281de75
--- /dev/null
+++ b/gitlab/build-mingw
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+echo "Building $(git log -1)"
+echo "---"
+
+COMMIT=$(git rev-parse --short HEAD)
+
+set -Eeuxo pipefail
+
+./autogen.sh
+rm -fr build
+mkdir build
+cd build
+mkdir vulkan-headers
+cp -r /usr/include/vulkan /usr/include/vk_video /usr/include/spirv vulkan-headers
+../configure --enable-demos --disable-doxygen-doc --without-ncurses --host=$HOST SONAME_LIBVULKAN="vulkan-1.dll" CPPFLAGS="-I$PWD/vulkan-headers" CFLAGS="-g -O2 -Wno-format -Wno-array-bounds" LDFLAGS="-static-libgcc" && \
+    make -j$(nproc) && \
+    make -j$(nproc) install DESTDIR="$PWD/destdir" || \
+        touch ../pipeline_failed
+
+mkdir -p ../artifacts/$COMMIT
+cp destdir/usr/local/bin/* ../artifacts/$COMMIT
+
+git reset --hard
diff --git a/gitlab/build.yml b/gitlab/build.yml
index e78e7081f..6a260510a 100644
--- a/gitlab/build.yml
+++ b/gitlab/build.yml
@@ -82,6 +82,41 @@ build-crosstest:
     paths:
       - artifacts

+.build-mingw:
+  stage: build
+  rules:
+    - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
+  image: $CI_REGISTRY/wine/vkd3d:debian-bookworm
+  interruptible: true
+  needs:
+    - job: build-image
+      optional: true
+  dependencies: []
+  script:
+    - git config --global --add safe.directory $CI_PROJECT_DIR
+    - git clean -fdx
+    - git reset --hard
+    - rm -fr .git/rebase-merge
+    - mkdir artifacts
+    - cat /proc/cpuinfo > artifacts/cpuinfo.txt
+    - cat /proc/meminfo > artifacts/meminfo.txt
+    - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mingw
+    - if [ -f pipeline_failed ] ; then exit 1 ; fi
+  artifacts:
+    when: always
+    paths:
+      - artifacts
+
+build-mingw-64:
+  extends: .build-mingw
+  variables:
+    HOST: "x86_64-w64-mingw32"
+
+build-mingw-32:
+  extends: .build-mingw
+  variables:
+    HOST: "i686-w64-mingw32"
+
 build-mac:
   stage: build
   rules:

[PATCH v5 2/2] ci: Prepend an ordinal number to commits in artifacts.

[Giovanni Mascellani]

From: Giovanni Mascellani

---
 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