From: Matthias Clasen <mclasen@redhat.com>
Date: Thu, 4 May 2023 02:32:00 +0000 (-0400)
Subject: ci: Remove the hack
X-Git-Tag: archive/raspbian/4.12.3+ds-1+rpi1~1^2^2^2~22^2~1^2~313^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=37fb370a5d48988ae88ff555a98ea14c537b50bd;p=gtk4.git

ci: Remove the hack
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d1e148d2ee..b152073e0b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -148,20 +148,8 @@ fedora-mingw64:
     - pip3 install --user meson~=1.0
     - meson subprojects download
     - meson subprojects update --reset
-      # Test that mingw64-meson still fails. If it has stopped failing, the CI
-      # will fail and now you should remove the hack that follows this.
-    - FAILED=false
-    - mingw64-meson --version || FAILED=true
-    - test $FAILED = false && echo "mingw64-meson works now, remove the hack" && exit 1
-      # HACK: Running mingw64-meson directly fails on the CI with:
-      #  /usr/bin/mingw64-meson: line 92: fg: no job control
-      # Because rpm is not evaluating %__meson and it gets interpreted as a job
-      # specifier. So we fix that and run it ourselves.
-    - rpm --eval "%{mingw64_meson}" > mingw64-meson.sh
-    - sed -i -e 's/%__meson/meson/' mingw64-meson.sh
-    - chmod +x mingw64-meson.sh
-    - ./mingw64-meson.sh -Dintrospection=disabled -Dgraphene:introspection=disabled _build
-    - ninja -C _build
+    - meson -Dintrospection=disabled -Dgraphene:introspection=disabled _build
+    - meson compile -C _build
 
 .mingw-defaults:
   stage: build