From 6bbcee8f1fddf9ddf2b1efbb77fd44e8aba6307c Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Thu, 15 Apr 2021 22:50:37 +0000
Subject: [PATCH 1/2] Attempt to fix MacOS beta shared runners.

I think they changed the tag a week ago without notifying us.
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74c50c8c4..721bc98d8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -120,7 +120,7 @@ Debian_Clang_tests:
 .MacOS:
   image: macos-11-xcode-12
   tags:
-    - macos
+    - shared-macos-amd64
   stage: build
   only:
     variables:

From 65e7857606459e822402dfe3b80242fc8b509713 Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali+gitlab@gmail.com>
Date: Fri, 16 Apr 2021 00:19:53 +0000
Subject: [PATCH 2/2] Maybe make -f flag work

Why can't -f just do what the manual says? Why do we even have a pre-existing build directory sometimes? We don't cache it, and artifacts are only supposed to be accessible within the same pipeline.
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 721bc98d8..99f28b60d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,7 +129,7 @@ Debian_Clang_tests:
     paths:
     - ccache/
   script:
-    - rm -fr build/*  # remove anything in the build directory
+    - rm -fr build  # remove the build directory
     - export CCACHE_BASEDIR="$(pwd)"
     - export CCACHE_DIR="$(pwd)/ccache"
     - mkdir -pv "${CCACHE_DIR}"