From ae73284a2d7a0536bfab68d46b46e76a12b6ce25 Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Wed, 12 Jul 2023 07:52:16 +0530
Subject: [PATCH] ci: Re-enable MSYS2 job

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ddd955d65b..ae422f4a2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -499,18 +499,15 @@ build vs2022 arm64:
 build msys2 :
   extends: '.build windows'
   timeout: '60min'
-  rules:
-    - changes:
-        *modules_changes
-      allow_failure: true
-      when: 'manual'
   script:
     - !reference [".build windows", "script"]
     # Replace backslashes with forward so bash doesn't complain
     - $env:CI_PROJECT_DIR = $env:CI_PROJECT_DIR.replace('\','/')
+    # Windows Graphics Capture currently requires Visual Studio
+    - $env:MESON_ARGS = $env:MESON_ARGS.replace('-Dgst-plugins-bad:d3d11-wgc=enabled','')
     # Configure MSYS2 to use the UCRT64 environment, start in the same directory
     # and inherit PATH
-    - C:\msys64\msys2_shell.cmd -ucrt64 -defterm -no-start -use-full-path -lc "meson setup build $env:MESON_ARGS && ninja -C build"
+    - C:\msys64\msys2_shell.cmd -ucrt64 -defterm -no-start -here -use-full-path -lc "meson setup build $env:MESON_ARGS && meson compile -C build"
 
 # ---- Tests ----- #