mirror of
https://github.com/XRPLF/clio.git
synced 2025-11-19 19:25:53 +00:00
ci: Start using apple-clang 17 in CI (#2432)
This commit is contained in:
8
.github/scripts/conan/apple-clang-ci.profile
vendored
8
.github/scripts/conan/apple-clang-ci.profile
vendored
@@ -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
|
|
||||||
5
.github/scripts/conan/init.sh
vendored
5
.github/scripts/conan/init.sh
vendored
@@ -8,10 +8,11 @@ REPO_DIR="$(cd "$CURRENT_DIR/../../../" && pwd)"
|
|||||||
CONAN_DIR="${CONAN_HOME:-$HOME/.conan2}"
|
CONAN_DIR="${CONAN_HOME:-$HOME/.conan2}"
|
||||||
PROFILES_DIR="$CONAN_DIR/profiles"
|
PROFILES_DIR="$CONAN_DIR/profiles"
|
||||||
|
|
||||||
|
# When developers' compilers are updated, these profiles might be different
|
||||||
if [[ -z "$CI" ]]; then
|
if [[ -z "$CI" ]]; then
|
||||||
APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-local.profile"
|
APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-17.profile"
|
||||||
else
|
else
|
||||||
APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-ci.profile"
|
APPLE_CLANG_PROFILE="$CURRENT_DIR/apple-clang-17.profile"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
GCC_PROFILE="$REPO_DIR/docker/ci/conan/gcc.profile"
|
GCC_PROFILE="$REPO_DIR/docker/ci/conan/gcc.profile"
|
||||||
|
|||||||
2
.github/workflows/upload_conan_deps.yml
vendored
2
.github/workflows/upload_conan_deps.yml
vendored
@@ -23,7 +23,6 @@ on:
|
|||||||
- .github/actions/generate/action.yml
|
- .github/actions/generate/action.yml
|
||||||
- .github/actions/prepare_runner/action.yml
|
- .github/actions/prepare_runner/action.yml
|
||||||
- ".github/scripts/conan/**"
|
- ".github/scripts/conan/**"
|
||||||
- "!.github/scripts/conan/apple-clang-local.profile"
|
|
||||||
|
|
||||||
- conanfile.py
|
- conanfile.py
|
||||||
- conan.lock
|
- conan.lock
|
||||||
@@ -35,7 +34,6 @@ on:
|
|||||||
- .github/actions/generate/action.yml
|
- .github/actions/generate/action.yml
|
||||||
- .github/actions/prepare_runner/action.yml
|
- .github/actions/prepare_runner/action.yml
|
||||||
- ".github/scripts/conan/**"
|
- ".github/scripts/conan/**"
|
||||||
- "!.github/scripts/conan/apple-clang-local.profile"
|
|
||||||
|
|
||||||
- conanfile.py
|
- conanfile.py
|
||||||
- conan.lock
|
- conan.lock
|
||||||
|
|||||||
Reference in New Issue
Block a user