diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-12-18 11:07:43 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-12-19 03:09:11 +0530 |
commit | 7242408d60a2e532f31e5907c7bc4b48fb5745c5 (patch) | |
tree | 6e0b238bddb49f6d91cb669873f16e0cfc5b3b21 | |
parent | 9c6dd9b3b570c8c5e3d21ff6f6b6a0996c3d9dc9 (diff) | |
download | gtk+-7242408d60a2e532f31e5907c7bc4b48fb5745c5.tar.gz |
ci: Fix fedora-mingw64 job
-rw-r--r-- | .gitlab-ci.yml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f090b4748..e6d5ca05e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -141,9 +141,20 @@ fedora-mingw64: - export PATH="$HOME/.local/bin:$PATH" - pip3 install --user meson~=0.64 - meson subprojects download - - mkdir _build && cd _build - - mingw64-meson -Dintrospection=disabled -Dgraphene:introspection=disabled - - ninja + # 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 installed-tests: extends: .build-fedora-default |