From 579e6030ca6a5573a3c71f09a8d789df3b5d0dcb Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Fri, 18 Jul 2025 11:42:56 +0100 Subject: [PATCH] chore: Install apple-clang 17 locally (#2342) --- .../{apple-clang.profile => apple-clang-ci.profile} | 0 .github/scripts/conan/apple-clang-local.profile | 11 +++++++++++ .github/scripts/conan/init.sh | 6 +++++- docs/build-clio.md | 4 ++-- 4 files changed, 18 insertions(+), 3 deletions(-) rename .github/scripts/conan/{apple-clang.profile => apple-clang-ci.profile} (100%) create mode 100644 .github/scripts/conan/apple-clang-local.profile diff --git a/.github/scripts/conan/apple-clang.profile b/.github/scripts/conan/apple-clang-ci.profile similarity index 100% rename from .github/scripts/conan/apple-clang.profile rename to .github/scripts/conan/apple-clang-ci.profile diff --git a/.github/scripts/conan/apple-clang-local.profile b/.github/scripts/conan/apple-clang-local.profile new file mode 100644 index 00000000..f39c9d9f --- /dev/null +++ b/.github/scripts/conan/apple-clang-local.profile @@ -0,0 +1,11 @@ +[settings] +arch={{detect_api.detect_arch()}} +build_type=Release +compiler=apple-clang +compiler.cppstd=20 +compiler.libcxx=libc++ +compiler.version=17 +os=Macos + +[conf] +grpc/1.50.1:tools.build:cxxflags+=["-Wno-missing-template-arg-list-after-template-kw"] diff --git a/.github/scripts/conan/init.sh b/.github/scripts/conan/init.sh index 6ef4a228..127f66ac 100755 --- a/.github/scripts/conan/init.sh +++ b/.github/scripts/conan/init.sh @@ -8,7 +8,11 @@ REPO_DIR="$(cd "$CURRENT_DIR/../../../" && pwd)" CONAN_DIR="${CONAN_HOME:-$HOME/.conan2}" PROFILES_DIR="$CONAN_DIR/profiles" -APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang.profile" +if [[ -z "$CI" ]]; then + APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-local.profile" +else + APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-ci.profile" +fi GCC_PROFILE="$REPO_DIR/docker/ci/conan/gcc.profile" CLANG_PROFILE="$REPO_DIR/docker/ci/conan/clang.profile" diff --git a/docs/build-clio.md b/docs/build-clio.md index a67cf825..3f1cf95b 100644 --- a/docs/build-clio.md +++ b/docs/build-clio.md @@ -35,7 +35,7 @@ The default profile is the file in `~/.conan2/profiles/default`. Here are some examples of possible profiles: -**Mac apple-clang 16 example**: +**Mac apple-clang 17 example**: ```text [settings] @@ -44,7 +44,7 @@ build_type=Release compiler=apple-clang compiler.cppstd=20 compiler.libcxx=libc++ -compiler.version=16 +compiler.version=17 os=Macos [conf]