diff --git a/.github/scripts/conan/apple-clang-local.profile b/.github/scripts/conan/apple-clang-17.profile similarity index 100% rename from .github/scripts/conan/apple-clang-local.profile rename to .github/scripts/conan/apple-clang-17.profile diff --git a/.github/scripts/conan/apple-clang-ci.profile b/.github/scripts/conan/apple-clang-ci.profile deleted file mode 100644 index b61f5eb4..00000000 --- a/.github/scripts/conan/apple-clang-ci.profile +++ /dev/null @@ -1,8 +0,0 @@ -[settings] -arch={{detect_api.detect_arch()}} -build_type=Release -compiler=apple-clang -compiler.cppstd=20 -compiler.libcxx=libc++ -compiler.version=16 -os=Macos diff --git a/.github/scripts/conan/init.sh b/.github/scripts/conan/init.sh index 2801bdac..929809d7 100755 --- a/.github/scripts/conan/init.sh +++ b/.github/scripts/conan/init.sh @@ -8,10 +8,11 @@ REPO_DIR="$(cd "$CURRENT_DIR/../../../" && pwd)" CONAN_DIR="${CONAN_HOME:-$HOME/.conan2}" PROFILES_DIR="$CONAN_DIR/profiles" +# When developers' compilers are updated, these profiles might be different if [[ -z "$CI" ]]; then - APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-local.profile" + APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-17.profile" else - APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-ci.profile" + APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-17.profile" fi GCC_PROFILE="$REPO_DIR/docker/ci/conan/gcc.profile" diff --git a/.github/workflows/upload_conan_deps.yml b/.github/workflows/upload_conan_deps.yml index 88d7aeec..83a58046 100644 --- a/.github/workflows/upload_conan_deps.yml +++ b/.github/workflows/upload_conan_deps.yml @@ -23,7 +23,6 @@ on: - .github/actions/generate/action.yml - .github/actions/prepare_runner/action.yml - ".github/scripts/conan/**" - - "!.github/scripts/conan/apple-clang-local.profile" - conanfile.py - conan.lock @@ -35,7 +34,6 @@ on: - .github/actions/generate/action.yml - .github/actions/prepare_runner/action.yml - ".github/scripts/conan/**" - - "!.github/scripts/conan/apple-clang-local.profile" - conanfile.py - conan.lock