[gobject-introspection] CI: test with clang + mingw-w64 on Windows

[Marco Trevisan <marcotrevi src gnome org>]

commit d81b95acf89e09bb96504aa865957f9c1a4c5881
Author: Christoph Reiter <reiter christoph gmail com>
Date:   Sat Jul 16 20:43:39 2022 +0200

    CI: test with clang + mingw-w64 on Windows
    
    The toolchain is different enough to warrant its own CI job imo.

 .gitlab-ci.yml                 | 16 ++++++++++++++++
 .gitlab-ci/test-msys2-meson.sh | 32 +++++++++++++-------------------
 2 files changed, 29 insertions(+), 19 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18c9c7beb..85f622d33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,6 +143,22 @@ msys2-mingw64-meson:
     paths:
       - _build/meson-logs
 
+msys2-clang64-meson:
+  stage: build
+  tags:
+    - win32-ps
+  variables:
+    MSYSTEM: "CLANG64"
+    CHERE_INVOKING: "yes"
+  script:
+    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
+    - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-meson.sh"
+  artifacts:
+    when: on_failure
+    name: "gi-_${env:CI_COMMIT_REF_NAME}"
+    paths:
+      - _build/meson-logs
+
 vs2017-x64-meson:
   stage: build
   tags:
diff --git a/.gitlab-ci/test-msys2-meson.sh b/.gitlab-ci/test-msys2-meson.sh
index c61efcdea..2fe3d6e0d 100644
--- a/.gitlab-ci/test-msys2-meson.sh
+++ b/.gitlab-ci/test-msys2-meson.sh
@@ -2,30 +2,24 @@
 
 set -e
 
-if [[ "$MSYSTEM" == "MINGW32" ]]; then
-    export MSYS2_ARCH="i686"
-else
-    export MSYS2_ARCH="x86_64"
-fi
-
 pacman --noconfirm -Suy
 
 pacman --noconfirm -S --needed \
     git \
     base-devel \
-    mingw-w64-$MSYS2_ARCH-toolchain \
-    mingw-w64-$MSYS2_ARCH-ccache \
-    mingw-w64-$MSYS2_ARCH-meson \
-    mingw-w64-$MSYS2_ARCH-python3 \
-    mingw-w64-$MSYS2_ARCH-python3-pip \
-    mingw-w64-$MSYS2_ARCH-python3-mako \
-    mingw-w64-$MSYS2_ARCH-python3-markdown \
-    mingw-w64-$MSYS2_ARCH-libffi \
-    mingw-w64-$MSYS2_ARCH-pkg-config \
-    mingw-w64-$MSYS2_ARCH-cairo \
-    mingw-w64-$MSYS2_ARCH-pcre2 \
-    mingw-w64-$MSYS2_ARCH-zlib \
-    mingw-w64-$MSYS2_ARCH-gettext
+    ${MINGW_PACKAGE_PREFIX}-toolchain \
+    ${MINGW_PACKAGE_PREFIX}-ccache \
+    ${MINGW_PACKAGE_PREFIX}-meson \
+    ${MINGW_PACKAGE_PREFIX}-python3 \
+    ${MINGW_PACKAGE_PREFIX}-python3-pip \
+    ${MINGW_PACKAGE_PREFIX}-python3-mako \
+    ${MINGW_PACKAGE_PREFIX}-python3-markdown \
+    ${MINGW_PACKAGE_PREFIX}-libffi \
+    ${MINGW_PACKAGE_PREFIX}-pkg-config \
+    ${MINGW_PACKAGE_PREFIX}-cairo \
+    ${MINGW_PACKAGE_PREFIX}-pcre2 \
+    ${MINGW_PACKAGE_PREFIX}-zlib \
+    ${MINGW_PACKAGE_PREFIX}-gettext
 
 export CCACHE_BASEDIR="${CI_PROJECT_DIR}"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"