Merge branch 'revert-82ab039a' into 'master'

Revert "Merge branch 'disable-macos-ci' into 'master'"

See merge request GNOME/gtk!3192

.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

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',