From 202277d03bc6117f870ee7ebfa6e5d37c4764f02 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Fri, 8 Dec 2023 14:29:24 +0100 Subject: [PATCH] build: apple-clang-15 support added --- .github/workflows/ci-conan.yml | 4 ++-- conanfile.py | 5 +++-- docs/getting_started/installation_and_usage.md | 1 + docs/index.md | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index c00a0d6e..248d8580 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -118,7 +118,7 @@ jobs: } - { name: "Apple Clang 15", - os: macos-latest, + os: macos-13, compiler: { type: APPLE_CLANG, @@ -178,7 +178,7 @@ jobs: if: matrix.config.compiler.type == 'APPLE_CLANG' && matrix.config.compiler.version == '15.0' shell: bash run: | - sudo xcode-select -s /Applications/Xcode_15.0.1.app && /usr/bin/xcodebuild -version + sudo xcode-select -s /Applications/Xcode_15.0.app && /usr/bin/xcodebuild -version - name: Install Ninja shell: bash run: | diff --git a/conanfile.py b/conanfile.py index 9565ec1e..4503eeb7 100644 --- a/conanfile.py +++ b/conanfile.py @@ -74,8 +74,9 @@ class MPUnitsConan(ConanFile): def _minimum_compilers_version(self): return { "gcc": "11", - "clang": "16" - # , "apple-clang": "13", "msvc": "192" + "clang": "16", + "apple-clang": "15" + # , "msvc": "192" } @property diff --git a/docs/getting_started/installation_and_usage.md b/docs/getting_started/installation_and_usage.md index 51457786..93b4faac 100644 --- a/docs/getting_started/installation_and_usage.md +++ b/docs/getting_started/installation_and_usage.md @@ -18,6 +18,7 @@ - please note that we observed some ICEs on gcc-11 - no problems with gcc-12.2+ - clang-16 + - apple-clang-15 ## Repository Structure and Dependencies diff --git a/docs/index.md b/docs/index.md index 3ced2ddb..7dec4ba6 100644 --- a/docs/index.md +++ b/docs/index.md @@ -37,3 +37,4 @@ The library source code is hosted on [GitHub](https://github.com/mpusz/mp-units) - please note that we observed some ICEs on gcc-11 - no problems with gcc-12.2+ - clang-16 + - apple-clang-15