From 30783d81f79dbdc622918e24733e7aba6814a02b Mon Sep 17 00:00:00 2001
From: Lee Maguire <lee.maguire@mongodb.com>
Date: Wed, 26 Jun 2024 22:52:50 +0100
Subject: [PATCH] Fix weirdness on CI

---
 .github/workflows/cmake.yml | 14 +++++---------
 CMakePresets.json           |  1 -
 cmake/cmake-build-xcode.sh  | 14 --------------
 3 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100755 cmake/cmake-build-xcode.sh

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 1b52c1d88..ff4394c32 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -65,25 +65,21 @@ jobs:
       - uses: ammaraskar/gcc-problem-matcher@master
 
       - name: Configure
-        run: |
-          mkdir build
-          cd build
-          cmake -GXcode -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DREALM_ENABLE_EXPERIMENTAL=1 -DREALM_DISABLE_ALIGNED_STORAGE=${{ matrix.disable-aligned-storage }} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ..
+        run: cmake --preset macos -DCMAKE_VERBOSE_MAKEFILE=${RUNNER_DEBUG:-OFF} -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DREALM_ENABLE_EXPERIMENTAL=1 -DREALM_DISABLE_ALIGNED_STORAGE=${{ matrix.disable-aligned-storage }} -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
 
       - name: Compile
-        working-directory: build
-        run: cmake --build . --config ${{ matrix.configuration }}
+        run: cmake --build --preset macos --config ${{ matrix.configuration }}
 
       - name: Non Sync Tests
-        working-directory: build/tests/${{ matrix.configuration }}/
+        working-directory: .build/cmake-preset-macos/tests/${{ matrix.configuration }}/
         run: ./cpprealm_db_tests
 
       - name: Flexible Sync Tests
-        working-directory: .build/tests/${{ matrix.configuration }}/
+        working-directory: .build/cmake-preset-macos/tests/${{ matrix.configuration }}/
         run: ./cpprealm_sync_tests "~client_reset"
 
       - name: Client Reset Tests
-        working-directory: .build/tests/${{ matrix.configuration }}/
+        working-directory: .build/cmake-preset-macos/tests/${{ matrix.configuration }}/
         run: ./cpprealm_sync_tests "client_reset"
 
       - name: Publish Test Report
diff --git a/CMakePresets.json b/CMakePresets.json
index 4b853072c..4e5d8b70c 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -61,7 +61,6 @@
       "inherits": "default",
       "generator": "Xcode",
       "cacheVariables": {
-        "CMAKE_MAKE_PROGRAM": "${sourceDir}/cmake/cmake-build-xcode.sh",
         "CMAKE_SYSTEM_NAME": "Darwin",
         "CMAKE_XCODE_ATTRIBUTE_ONLY_ACTIVE_ARCH": "YES"
       },
diff --git a/cmake/cmake-build-xcode.sh b/cmake/cmake-build-xcode.sh
deleted file mode 100755
index 3b551958b..000000000
--- a/cmake/cmake-build-xcode.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -eo pipefail
-
-XCODEBUILD_ARGS=()
-for arg in "$@"
-do
-    if [ "$arg" = "-target" ]; then
-        arg="-scheme"
-    fi
-    XCODEBUILD_ARGS+=("$arg")
-done
-
-xcodebuild "${XCODEBUILD_ARGS[@]}"