From 1f5e92bc3c476e8fdaf87200d85d53a1d9e0fef1 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Wed, 12 Jul 2023 07:51:36 +0530
Subject: [PATCH] ci: Fix windows visual studio x86 job

meson setup --vsenv will actually always pick the host arch (64-bit),
not 32-bit, so we have to force it.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/5018>
---
 .gitlab-ci.yml | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 84dd5516be..ddd955d65b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -453,7 +453,7 @@ build fedora clang:
    paths:
      - 'build/meson-logs/'
 
-.build windows native:
+build vs2022 amd64:
   extends: '.build windows'
   script:
     - !reference [".build windows", "script"]
@@ -465,18 +465,24 @@ build fedora clang:
     - meson install -C build --destdir installdir
     - Remove-Item -Recurse -Force build\installdir
 
-build vs2022 amd64:
-  extends: '.build windows native'
-  variables:
-    ARCH: 'amd64'
+.build windows cross:
+  extends: '.build windows'
+  script:
+    - !reference [".build windows", "script"]
+      # Setting up a cross build with MSVC is still non-trivial because
+      # the --vsenv argument cannot be used to set it up
+    - echo $env:MESON_CROSS_ARGS
+    - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
+        meson setup build $env:MESON_ARGS $env:MESON_CROSS_ARGS &&
+        meson compile -C build "
 
 build vs2022 x86:
-  extends: '.build windows native'
+  extends: '.build windows cross'
   variables:
     ARCH: 'x86'
 
 build vs2022 arm64:
-  extends: '.build windows'
+  extends: '.build windows cross'
   variables:
     ARCH: 'arm64'
     # pango pulls in cairo which pulls in pixman which doesn't build because of
@@ -489,15 +495,6 @@ build vs2022 arm64:
       --cross-file ci/meson/vs2022-arm64-cross.ini
       --native-file ci/meson/vs2022-paths.ini
       --native-file ci/meson/vs2022-x64-native.ini
-  script:
-    - !reference [".build windows", "script"]
-      # Setting up a cross build with MSVC is still non-trivial because
-      # the --vsenv argument cannot be used to set it up
-    - echo $env:MESON_ARGS
-    - echo $env:MESON_CROSS_ARGS
-    - cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=$env:ARCH &&
-        meson setup build $env:MESON_ARGS $env:MESON_CROSS_ARGS &&
-        meson compile -C build "
 
 build msys2 :
   extends: '.build windows'