diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-02-12 21:29:08 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-02-12 21:29:08 +0000 |
| commit | 6601d79b2deb4388cbf19d2ab24fa0c9dd033382 (patch) | |
| tree | f5dd8d2b1a0e8403e8e704460ad4a91fe8f01443 | |
| parent | 5d13bb7aa2effa16c49ff804d4c9fbfcaac8f897 (diff) | |
| parent | 5ff843f97d6b29494c94ed8c2ed40e6df9aba4ed (diff) | |
| download | gtk+-6601d79b2deb4388cbf19d2ab24fa0c9dd033382.tar.gz | |
Merge branch 'revert-82ab039a' into 'master'
Revert "Merge branch 'disable-macos-ci' into 'master'"
See merge request GNOME/gtk!3192
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | meson.build | 10 |
2 files changed, 4 insertions, 11 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8476616092..300cb865a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,9 +146,7 @@ msys2-mingw64: MSYSTEM: "MINGW64" CHERE_INVOKING: "yes" -# FIXME: Temporarily disabled while the macOS runner is offline -# See https://gitlab.gnome.org/Infrastructure/GitLab/-/issues/495 -.macos: +macos: extends: .only-default only: - branches@GNOME/gtk @@ -161,6 +159,7 @@ msys2-mingw64: - pip3 install --user meson==0.56 - pip3 install --user ninja - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH + - export MESON_FORCE_BACKTRACE=1 script: - meson -Dx11-backend=false -Dintrospection=disabled diff --git a/meson.build b/meson.build index 8677754121..c3a980ef8d 100644 --- a/meson.build +++ b/meson.build @@ -391,14 +391,8 @@ harfbuzz_dep = dependency('harfbuzz', version: '>= 0.9', required: false, fallback: ['harfbuzz', 'libharfbuzz_dep'], default_options: ['coretext=enabled']) xkbdep = dependency('xkbcommon', version: xkbcommon_req, required: wayland_enabled) -if os_darwin - graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req, - fallback: ['graphene', 'graphene_dep'], - default_options: ['introspection=false']) -else - graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req, - fallback: ['graphene', 'graphene_dep']) -endif +graphene_dep = dependency('graphene-gobject-1.0', version: graphene_req, + fallback: ['graphene', 'graphene_dep']) iso_codes_dep = dependency('iso-codes', required: false) gtk_doc_dep = dependency('gtk-doc', version: '>=1.33', |