From 0ce0402edfb3698d4b0463e7df863e08035a94e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= Date: Fri, 12 Feb 2021 19:40:57 +0000 Subject: [PATCH 1/3] Revert "Merge branch 'disable-macos-ci' into 'master'" This reverts merge request !3183 --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8476616092..edde8904aa 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 From b1c1e02c288e94b889b1709131d8be26dd40e030 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 12 Feb 2021 15:24:27 -0500 Subject: [PATCH 2/3] ci: Add debug spew on macos --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index edde8904aa..300cb865a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -159,6 +159,7 @@ macos: - 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 From 5ff843f97d6b29494c94ed8c2ed40e6df9aba4ed Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 12 Feb 2021 16:04:15 -0500 Subject: [PATCH 3/3] Stop passing introspection=false to graphene This should no longer be possible (and the introspection option is no longer a boolean. --- meson.build | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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',