diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2023-05-03 22:32:00 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2023-05-03 22:32:00 -0400 |
| commit | 37fb370a5d48988ae88ff555a98ea14c537b50bd (patch) | |
| tree | dd4b64db341acc803d5f80cb26e7b572f024be0d /.gitlab-ci.yml | |
| parent | 1cc9413383ef86e0ab758f3f1dde59d24217aac9 (diff) | |
| download | gtk+-37fb370a5d48988ae88ff555a98ea14c537b50bd.tar.gz | |
ci: Remove the hack
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 16 |
1 files changed, 2 insertions, 14 deletions
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 |