Skip to content

Commit 292f11f

Browse files
committed
ci: update Conan to 2.6.0 + update runners to macos 14/13 CI
1 parent 513fcc4 commit 292f11f

File tree

4 files changed

+8
-16
lines changed

4 files changed

+8
-16
lines changed

.github/workflows/ci.cross.arm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
Test:
11-
if: "!contains(github.event.head_commit.message, '[skip ci]')"
11+
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
fail-fast: false

.github/workflows/ci.cross.mingw.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
Test:
11-
if: "!contains(github.event.head_commit.message, '[skip ci]')"
11+
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
fail-fast: false

.github/workflows/ci.emscripten.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88

99
jobs:
1010
Test:
11-
if: "!contains(github.event.head_commit.message, '[skip ci]')"
11+
if: ${{ !contains(github.event.head_commit.message, '[skip ci]') }}
1212
runs-on: ${{ matrix.os }}
1313
strategy:
1414
fail-fast: false

.github/workflows/ci.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ jobs:
1616
os:
1717
- windows-2022
1818
- ubuntu-22.04
19-
- macos-12
19+
- macos-13
20+
- macos-14
2021
compiler:
2122
- llvm
2223
- gcc
@@ -40,12 +41,6 @@ jobs:
4041
- os: "windows-2022"
4142
compiler: "msvc"
4243
vcvarsall: false
43-
exclude:
44-
# fails with an internal error
45-
- os: "macos-12"
46-
compiler: "gcc"
47-
cmake: true
48-
vcvarsall: true
4944
steps:
5045
- uses: actions/checkout@v3
5146
with:
@@ -60,7 +55,7 @@ jobs:
6055
${{ env.XDG_CACHE_HOME }}/vcpkg/archives
6156
${{ env.LOCALAPPDATA }}\vcpkg\archives
6257
${{ env.APPDATA }}\vcpkg\archives
63-
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt') }}-${{ hashFiles('./vcpkg.json')}}-${{ matrix.cmake }}
58+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt', './vcpkg.json')}}-${{ matrix.cmake }}
6459
restore-keys: |
6560
${{ runner.os }}-${{ env.BUILD_TYPE }}-
6661
@@ -72,11 +67,11 @@ jobs:
7267
cmake: ${{ matrix.cmake }}
7368
ninja: true
7469
vcpkg: true
75-
conan: 2.1.0
70+
conan: 2.6.0
7671
cppcheck: true
7772
clangtidy: true
7873
task: true
79-
doxygen: ${{ !contains(matrix.os, 'macos-11') && !contains(matrix.os, 'macos-13') }}
74+
doxygen: true
8075

8176
- name: Test
8277
if: ${{ !cancelled() }}
@@ -86,9 +81,6 @@ jobs:
8681
CMAKE_GENERATOR: ${{ matrix.cmake_generator }}
8782

8883
- name: Lint
89-
if: ${{ !cancelled() && matrix.os == 'ubuntu-20.04' && matrix.compiler == 'gcc' }}
9084
run: |
91-
# TODO add to setup-cpp
9285
python3 -m pip install --user cmakelint cmake-format
93-
9486
task lint

0 commit comments

Comments
 (0)