ci: apple-clang enabled also for CMake CI tests

mpusz · Dec 8, 2023 · 731d77d · 731d77d
1 parent 202277d
commit 731d77d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 17 deletions.
diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
@@ -174,11 +174,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 == '15.0'
+      - name: Select Xcode version
+        if: matrix.config.compiler.type == 'APPLE_CLANG'
         shell: bash
         run: |
-          sudo xcode-select -s /Applications/Xcode_15.0.app && /usr/bin/xcodebuild -version
+          sudo xcode-select -s /Applications/Xcode_${{ matrix.config.compiler.version }}.app && /usr/bin/xcodebuild -version
       - name: Install Ninja
         shell: bash
         run: |

diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml
@@ -111,17 +111,18 @@ jobs:
               lib: "libc++",
               conan-config: "",
             }
-          # - {
-          #     name: "Apple Clang 13",
-          #     os: macos-11,
-          #     compiler:
-          #       {
-          #         type: APPLE_CLANG,
-          #         version: "13.0",
-          #         cc: "clang",
-          #         cxx: "clang++",
-          #       },
-          #   }
+          - {
+              name: "Apple Clang 15",
+              os: macos-13,
+              compiler:
+                {
+                  type: APPLE_CLANG,
+                  version: "15.0",
+                  cc: "clang",
+                  cxx: "clang++",
+                },
+              conan-config: "",
+            }
         build_type: ["Release", "Debug"]
 
     env:
@@ -167,11 +168,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'
+      - name: Select Xcode version
+        if: matrix.config.compiler.type == 'APPLE_CLANG'
         shell: bash
         run: |
-          sudo xcode-select -s "/Applications/Xcode_13.0.app"
+          sudo xcode-select -s /Applications/Xcode_${{ matrix.config.compiler.version }}.app && /usr/bin/xcodebuild -version
       - name: Install Ninja
         shell: bash
         run: |