From 4ae66aafb19f6bbf1ece5c010aed2d3826d50c2c Mon Sep 17 00:00:00 2001
From: Frank Dischner <frank.dischner@gmail.com>
Date: Sat, 29 Jan 2022 11:25:32 -0600
Subject: [PATCH 1/3] ci: Apple clang 13 support added to "CMake Test Package
 CI"

---
 .github/workflows/ci-test-package-cmake.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml
index 71de1c31..c27a9fb2 100644
--- a/.github/workflows/ci-test-package-cmake.yml
+++ b/.github/workflows/ci-test-package-cmake.yml
@@ -77,6 +77,11 @@ jobs:
             compiler: { type: CLANG, version: 13, cc: "clang-13", cxx: "clang++-13" },
             lib: "libc++"
           }
+        - {
+            name: "MacOS Apple Clang 13",
+            os: macos-11,
+            compiler: { type: APPLE_CLANG, version: 13, cc: "clang", cxx: "clang++" }
+          }
         # In case a Conan docker image will be needed to provide a specific configuration we can use a Docker image as follows
         # - {
         #     name: "Ubuntu GCC 10.2.0",
@@ -131,6 +136,9 @@ jobs:
             sudo apt install -y ninja-build
           elif [ $RUNNER_OS == 'Windows' ]; then
             choco install ninja
+          elif [ $RUNNER_OS == 'macOS' ]; then
+            brew update
+            brew install ninja
           else
             echo "'$RUNNER_OS' not supported"
             exit 1

From aba980290b9482dcd1a95f1f7ba0be48cdf5b87d Mon Sep 17 00:00:00 2001
From: Frank Dischner <frank.dischner@gmail.com>
Date: Sat, 29 Jan 2022 11:56:35 -0600
Subject: [PATCH 2/3] ci: explicitly set used xcode version

---
 .github/workflows/ci-test-package-cmake.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml
index c27a9fb2..568083a7 100644
--- a/.github/workflows/ci-test-package-cmake.yml
+++ b/.github/workflows/ci-test-package-cmake.yml
@@ -80,7 +80,7 @@ jobs:
         - {
             name: "MacOS Apple Clang 13",
             os: macos-11,
-            compiler: { type: APPLE_CLANG, version: 13, cc: "clang", cxx: "clang++" }
+            compiler: { type: APPLE_CLANG, version: "13.0", cc: "clang", cxx: "clang++" }
           }
         # In case a Conan docker image will be needed to provide a specific configuration we can use a Docker image as follows
         # - {
@@ -127,6 +127,11 @@ jobs:
         shell: bash
         run: |
           sudo apt install -y libc++-${{ matrix.config.compiler.version }}-dev libc++abi-${{ matrix.config.compiler.version }}-dev libunwind-${{ matrix.config.compiler.version }}-dev
+      - name: Select Xcode 13.0
+        if: matrix.config.compiler.type == 'APPLE_CLANG' && matrix.config.compiler.version == '13.0'
+        shell: bash
+        run: |
+          sudo xcode-select -s "/Applications/Xcode_13.0.app"
       - name: Install Ninja
         # TODO Find a proper syntax to make the below work
         # if: !matrix.config.docker_image

From 8accecb15c0d19d50bed8afd2a9986a6c945fd1f Mon Sep 17 00:00:00 2001
From: Frank Dischner <frank.dischner@gmail.com>
Date: Sat, 29 Jan 2022 12:12:09 -0600
Subject: [PATCH 3/3] ci: Apple clang 13 support added for Conan

---
 .github/workflows/ci-conan.yml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
index 8654acad..9a4f3ecc 100644
--- a/.github/workflows/ci-conan.yml
+++ b/.github/workflows/ci-conan.yml
@@ -78,6 +78,11 @@ jobs:
             compiler: { type: CLANG, version: 13, cc: "clang-13", cxx: "clang++-13", std: 20 },
             lib: "libc++"
           }
+        - {
+            name: "MacOS Apple Clang 13",
+            os: macos-11,
+            compiler: { type: APPLE_CLANG, version: "13.0", cc: "clang", cxx: "clang++", std: 20 }
+          }
         # In case a Conan docker image will be needed to provide a specific configuration we can use a Docker image as follows
         # - {
         #     name: "Ubuntu GCC 10.2.0",
@@ -112,6 +117,11 @@ jobs:
         shell: bash
         run: |
           sudo apt install -y libc++-${{ matrix.config.compiler.version }}-dev libc++abi-${{ matrix.config.compiler.version }}-dev libunwind-${{ matrix.config.compiler.version }}-dev
+      - name: Select Xcode 13.0
+        if: matrix.config.compiler.type == 'APPLE_CLANG' && matrix.config.compiler.version == '13.0'
+        shell: bash
+        run: |
+          sudo xcode-select -s "/Applications/Xcode_13.0.app"
       - name: Install Ninja
         # TODO Find a proper syntax to make the below work
         # if: !matrix.config.docker_image
@@ -121,6 +131,9 @@ jobs:
             sudo apt install -y ninja-build
           elif [ $RUNNER_OS == 'Windows' ]; then
             choco install ninja
+          elif [ $RUNNER_OS == 'macOS' ]; then
+            brew update
+            brew install ninja
           else
             echo "'$RUNNER_OS' not supported"
             exit 1