Skip to content

Commit b4d771e

Browse files
committed
Update CI matrix and GitHub Actions versions
Refresh CI configuration and workflows to use current runners and action releases. .github/matrix.json: simplify job names, replace explicit OS versions with ubuntu-latest/macos-latest/windows-latest and remove per-job compiler "version" fields. .github/workflows: bump actions/checkout to v6, ssciwr/doxygen-install to v2, and actions/upload-pages-artifact to v4; set CC/CXX without toolchain-version suffix to rely on runner defaults. These updates keep CI up-to-date and simplify compiler/environment setup across the matrix.
1 parent 133ec0d commit b4d771e

3 files changed

Lines changed: 34 additions & 43 deletions

File tree

.github/matrix.json

Lines changed: 25 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,85 @@
11
{
22
"config": [
33
{
4-
"name": "Linux GCC 11 C++17",
4+
"name": "Linux GCC C++17",
55
"compiler": "gcc",
6-
"version": "11",
7-
"os": "ubuntu-22.04",
6+
"os": "ubuntu-latest",
87
"cxxstd": "17",
98
"build-type": "Release"
109
},
1110
{
12-
"name": "Linux GCC 11 C++20",
11+
"name": "Linux GCC C++20",
1312
"compiler": "gcc",
14-
"version": "11",
15-
"os": "ubuntu-22.04",
13+
"os": "ubuntu-latest",
1614
"cxxstd": "20",
1715
"build-type": "Release"
1816
},
1917
{
20-
"name": "Linux GCC 11 C++17 Debug",
18+
"name": "Linux GCC C++17 Debug",
2119
"compiler": "gcc",
22-
"version": "11",
23-
"os": "ubuntu-22.04",
20+
"os": "ubuntu-latest",
2421
"cxxstd": "17",
2522
"build-type": "Debug"
2623
},
2724
{
28-
"name": "Linux Clang 14 C++17",
25+
"name": "Linux Clang C++17",
2926
"compiler": "clang",
30-
"version": "14",
31-
"os": "ubuntu-22.04",
27+
"os": "ubuntu-latest",
3228
"cxxstd": "17",
3329
"build-type": "Release"
3430
},
3531
{
36-
"name": "Linux Clang 14 C++20",
32+
"name": "Linux Clang C++20",
3733
"compiler": "clang",
38-
"version": "14",
39-
"os": "ubuntu-22.04",
34+
"os": "ubuntu-latest",
4035
"cxxstd": "20",
4136
"build-type": "Release"
4237
},
4338
{
44-
"name": "Linux Clang 14 C++17 Debug",
39+
"name": "Linux Clang C++17 Debug",
4540
"compiler": "clang",
46-
"version": "14",
47-
"os": "ubuntu-22.04",
41+
"os": "ubuntu-latest",
4842
"cxxstd": "17",
4943
"build-type": "Debug"
5044
},
5145
{
52-
"name": "macOS apple-clang 14.3.1 C++17",
46+
"name": "macOS apple-clang C++17",
5347
"compiler": "apple-clang",
54-
"version": "14.3.1",
55-
"os": "macos-13",
48+
"os": "macos-latest",
5649
"cxxstd": "17",
5750
"build-type": "Release"
5851
},
5952
{
60-
"name": "macOS apple-clang 14.3.1 C++20",
53+
"name": "macOS apple-clang C++20",
6154
"compiler": "apple-clang",
62-
"version": "14.3.1",
63-
"os": "macos-13",
55+
"os": "macos-latest",
6456
"cxxstd": "20",
6557
"build-type": "Release"
6658
},
6759
{
68-
"name": "macOS apple-clang 14.3.1 C++17 Debug",
60+
"name": "macOS apple-clang C++17 Debug",
6961
"compiler": "apple-clang",
70-
"version": "14.3.1",
71-
"os": "macos-13",
62+
"os": "macos-latest",
7263
"cxxstd": "17",
7364
"build-type": "Debug"
7465
},
7566
{
76-
"name": "Windows VS2022 C++17",
77-
"os": "windows-2022",
67+
"name": "Windows C++17",
68+
"os": "windows-latest",
7869
"cxxstd": "17",
7970
"build-type": "Release"
8071
},
8172
{
82-
"name": "Windows VS2022 C++20",
83-
"os": "windows-2022",
73+
"name": "Windows C++20",
74+
"os": "windows-latest",
8475
"cxxstd": "20",
8576
"build-type": "Release"
8677
},
8778
{
88-
"name": "Windows VS2022 C++17 Debug",
89-
"os": "windows-2022",
79+
"name": "Windows C++17 Debug",
80+
"os": "windows-latest",
9081
"cxxstd": "17",
9182
"build-type": "Debug"
9283
}
9384
]
94-
}
85+
}

.github/workflows/adobe_source_libraries.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
outputs:
1616
matrix: ${{ steps.set-matrix.outputs.matrix }}
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v6
1919

2020
- name: Generate job matrix
2121
id: set-matrix
@@ -32,21 +32,21 @@ jobs:
3232
name: ${{ matrix.config.name }}
3333

3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v6
3636

3737
- name: Set enviroment variables (Linux+GCC)
3838
if: ${{ matrix.config.compiler == 'gcc' }}
3939
shell: bash
4040
run: |
41-
echo "CC=gcc-${{matrix.config.version}}" >> $GITHUB_ENV
42-
echo "CXX=g++-${{matrix.config.version}}" >> $GITHUB_ENV
41+
echo "CC=gcc" >> $GITHUB_ENV
42+
echo "CXX=g++" >> $GITHUB_ENV
4343
4444
- name: Set enviroment variables (Linux+Clang)
4545
if: ${{ matrix.config.compiler == 'clang' }}
4646
shell: bash
4747
run: |
48-
echo "CC=clang-${{matrix.config.version}}" >> $GITHUB_ENV
49-
echo "CXX=clang++-${{matrix.config.version}}" >> $GITHUB_ENV
48+
echo "CC=clang" >> $GITHUB_ENV
49+
echo "CXX=clang++" >> $GITHUB_ENV
5050
5151
- name: Configure (Ubuntu)
5252
if: ${{ startsWith(matrix.config.os, 'ubuntu') }}

.github/workflows/doxygen.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ jobs:
2121

2222
steps:
2323
- name: Checkout code
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@v6
2525

2626
- name: Install dependencies
27-
uses: ssciwr/doxygen-install@v1
27+
uses: ssciwr/doxygen-install@v2
2828

2929
- name: Configure CMake with docs
3030
run: cmake --preset docs
@@ -36,7 +36,7 @@ jobs:
3636
uses: actions/configure-pages@v5
3737

3838
- name: Upload artifact
39-
uses: actions/upload-pages-artifact@v3
39+
uses: actions/upload-pages-artifact@v4
4040
with:
4141
path: ./build/docs/html
4242

0 commit comments

Comments
 (0)