From df0610aa55fe1fe13b18249b29bcbd1523f780fd Mon Sep 17 00:00:00 2001
From: Philip Withnall <withnall@endlessm.com>
Date: Mon, 20 Jan 2020 15:30:44 +0000
Subject: [PATCH] ci: Use --wrap-mode=default on macOS CI runner (only)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a partial revert of commit 595e12b5fb for macOS only, since we
can’t run a VM image on that CI runner, and hence can’t easily
pre-populate it with cached dependencies.

Signed-off-by: Philip Withnall <withnall@endlessm.com>
---
 .gitlab-ci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0a4d1f58d..50803ee09 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -366,7 +366,13 @@ macos:
     - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
   script:
     # FIXME: Add --werror
+    # FIXME: Use --wrap-mode=default so we download dependencies each time,
+    # until the macOS runner is a VM where we can use a pre-made image which
+    # already contains the dependencies. See:
+    #  - https://gitlab.gnome.org/GNOME/glib/merge_requests/388
+    #  - https://gitlab.gnome.org/Infrastructure/Infrastructure/issues/225
     - meson ${MESON_COMMON_OPTIONS}
+            --wrap-mode=default
             _build
     - ninja -C _build
     # FIXME: Multiple unit tests currently fails