diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2022-05-12 20:02:03 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2022-05-12 20:02:03 +0000 |
| commit | f61618b4cc053d957a8eae8179a00728eefda79b (patch) | |
| tree | aaaace728e0f95ffe3722020c033b8985cdfa33d | |
| parent | 9b7308cbb21e916fb1e6e682b2e1a3d7a75c48ea (diff) | |
| parent | 47e6d52f208b923401ce65a05c9aca0e2a66d48e (diff) | |
| download | gdk-pixbuf-f61618b4cc053d957a8eae8179a00728eefda79b.tar.gz | |
Merge branch 'ebassi/msys-no-man-pages' into 'master'
ci: Disable man pages on MSYS2
See merge request GNOME/gdk-pixbuf!133
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | .gitlab/ci/test-msys2.sh | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 17a9ba38e..a0932f8c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,6 +74,7 @@ macos: when: always paths: - "${CI_PROJECT_DIR}/_build/meson-logs" + allow_failure: true msys2-mingw64: stage: build diff --git a/.gitlab/ci/test-msys2.sh b/.gitlab/ci/test-msys2.sh index f9ac9e639..270807e2b 100644 --- a/.gitlab/ci/test-msys2.sh +++ b/.gitlab/ci/test-msys2.sh @@ -24,6 +24,7 @@ meson setup --buildtype debug \ -Dpng=enabled \ -Djpeg=enabled \ -Dtiff=enabled \ + -Dman=false \ _build meson compile -C _build |