mirror of
https://github.com/mpusz/mp-units.git
synced 2025-07-29 18:07:16 +02:00
ci: apple-clang enabled also for CMake CI tests
This commit is contained in:
6
.github/workflows/ci-conan.yml
vendored
6
.github/workflows/ci-conan.yml
vendored
@ -174,11 +174,11 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo apt install -y libc++-${{ matrix.config.compiler.version }}-dev libc++abi-${{ matrix.config.compiler.version }}-dev libunwind-${{ matrix.config.compiler.version }}-dev
|
sudo apt install -y libc++-${{ matrix.config.compiler.version }}-dev libc++abi-${{ matrix.config.compiler.version }}-dev libunwind-${{ matrix.config.compiler.version }}-dev
|
||||||
- name: Select Xcode 13.0
|
- name: Select Xcode version
|
||||||
if: matrix.config.compiler.type == 'APPLE_CLANG' && matrix.config.compiler.version == '15.0'
|
if: matrix.config.compiler.type == 'APPLE_CLANG'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo xcode-select -s /Applications/Xcode_15.0.app && /usr/bin/xcodebuild -version
|
sudo xcode-select -s /Applications/Xcode_${{ matrix.config.compiler.version }}.app && /usr/bin/xcodebuild -version
|
||||||
- name: Install Ninja
|
- name: Install Ninja
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
29
.github/workflows/ci-test-package-cmake.yml
vendored
29
.github/workflows/ci-test-package-cmake.yml
vendored
@ -111,17 +111,18 @@ jobs:
|
|||||||
lib: "libc++",
|
lib: "libc++",
|
||||||
conan-config: "",
|
conan-config: "",
|
||||||
}
|
}
|
||||||
# - {
|
- {
|
||||||
# name: "Apple Clang 13",
|
name: "Apple Clang 15",
|
||||||
# os: macos-11,
|
os: macos-13,
|
||||||
# compiler:
|
compiler:
|
||||||
# {
|
{
|
||||||
# type: APPLE_CLANG,
|
type: APPLE_CLANG,
|
||||||
# version: "13.0",
|
version: "15.0",
|
||||||
# cc: "clang",
|
cc: "clang",
|
||||||
# cxx: "clang++",
|
cxx: "clang++",
|
||||||
# },
|
},
|
||||||
# }
|
conan-config: "",
|
||||||
|
}
|
||||||
build_type: ["Release", "Debug"]
|
build_type: ["Release", "Debug"]
|
||||||
|
|
||||||
env:
|
env:
|
||||||
@ -167,11 +168,11 @@ jobs:
|
|||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo apt install -y libc++-${{ matrix.config.compiler.version }}-dev libc++abi-${{ matrix.config.compiler.version }}-dev libunwind-${{ matrix.config.compiler.version }}-dev
|
sudo apt install -y libc++-${{ matrix.config.compiler.version }}-dev libc++abi-${{ matrix.config.compiler.version }}-dev libunwind-${{ matrix.config.compiler.version }}-dev
|
||||||
- name: Select Xcode 13.0
|
- name: Select Xcode version
|
||||||
if: matrix.config.compiler.type == 'APPLE_CLANG' && matrix.config.compiler.version == '13.0'
|
if: matrix.config.compiler.type == 'APPLE_CLANG'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
sudo xcode-select -s "/Applications/Xcode_13.0.app"
|
sudo xcode-select -s /Applications/Xcode_${{ matrix.config.compiler.version }}.app && /usr/bin/xcodebuild -version
|
||||||
- name: Install Ninja
|
- name: Install Ninja
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
|
Reference in New Issue
Block a user