Turn on macOS runners in CI (#1185)

This commit is contained in:
Sergey Kuznetsov
2024-02-23 13:22:03 +00:00
committed by GitHub
parent 33700e3305
commit 0f5da4414c
4 changed files with 16 additions and 17 deletions

View File

@@ -11,7 +11,10 @@ runs:
if: ${{ runner.os == 'macOS' }}
shell: bash
run: |
brew install llvm@14 pkg-config ninja bison cmake ccache jq gh
brew install llvm@14 pkg-config ninja bison cmake ccache jq gh conan@1
if ! command -v conan &> /dev/null; then
echo "/opt/homebrew/opt/conan@1/bin" >> $GITHUB_PATH
fi
- name: Fix git permissions on Linux
if: ${{ runner.os == 'Linux' }}

View File

@@ -11,19 +11,15 @@ runs:
if: ${{ runner.os == 'macOS' }}
shell: bash
env:
CONAN_PROFILE: clio_clang_14
CONAN_PROFILE: clio_apple_clang_15
id: conan_setup_mac
run: |
echo "Creating $CONAN_PROFILE conan profile";
clang_path="$(brew --prefix llvm@14)/bin/clang"
clang_cxx_path="$(brew --prefix llvm@14)/bin/clang++"
conan profile new $CONAN_PROFILE --detect --force
conan profile update settings.compiler=clang $CONAN_PROFILE
conan profile update settings.compiler.version=14 $CONAN_PROFILE
conan profile update settings.compiler.libcxx=libc++ $CONAN_PROFILE
conan profile update settings.compiler.cppstd=20 $CONAN_PROFILE
conan profile update "conf.tools.build:compiler_executables={\"c\": \"$clang_path\", \"cpp\": \"$clang_cxx_path\"}" $CONAN_PROFILE
conan profile update env.CC="$clang_path" $CONAN_PROFILE
conan profile update env.CXX="$clang_cxx_path" $CONAN_PROFILE
conan profile update env.CXXFLAGS=-DBOOST_ASIO_DISABLE_CONCEPTS $CONAN_PROFILE
conan profile update "conf.tools.build:cxxflags+=[\"-DBOOST_ASIO_DISABLE_CONCEPTS\"]" $CONAN_PROFILE
echo "created_conan_profile=$CONAN_PROFILE" >> $GITHUB_OUTPUT
- name: On linux

View File

@@ -32,9 +32,9 @@ jobs:
image: rippleci/clio_ci:latest
build_type: Debug
code_coverage: true
# - os: macOS
# build_type: Release
# code_coverage: false
- os: macos14
build_type: Release
code_coverage: false
runs-on: [self-hosted, "${{ matrix.os }}"]
container: ${{ matrix.container }}
@@ -142,7 +142,7 @@ jobs:
- os: heavy
container:
image: rippleci/clio_ci:latest
# - os: macOS
- os: macos14
runs-on: [self-hosted, "${{ matrix.os }}"]
container: ${{ matrix.container }}

View File

@@ -11,8 +11,8 @@ jobs:
fail-fast: false
matrix:
include:
# - os: macOS
# build_type: Release
- os: macos14
build_type: Release
- os: heavy
build_type: Release
container:
@@ -76,8 +76,8 @@ jobs:
fail-fast: false
matrix:
include:
# - os: macOS
# build_type: Release
- os: macos14
build_type: Release
- os: heavy
build_type: Release
- os: heavy