Skip to content

Commit 4f428eb

Browse files
sean-parentsean-parent
authored
Merge pull request #151 from stlab/sean-parent/ci-update
Update CI matrix and GitHub Actions versions
2 parents 133ec0d + 81e3b98 commit 4f428eb

4 files changed

Lines changed: 47 additions & 55 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: 12 additions & 12 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,25 @@ jobs:
3232
name: ${{ matrix.config.name }}
3333

3434
steps:
35-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v6
36+
- if: ${{ startsWith(matrix.config.os, 'windows') }}
37+
uses: ilammy/msvc-dev-cmd@v1
38+
with:
39+
arch: amd64
3640

37-
- name: Set enviroment variables (Linux+GCC)
41+
- name: Set environment variables (Linux+GCC)
3842
if: ${{ matrix.config.compiler == 'gcc' }}
3943
shell: bash
4044
run: |
41-
echo "CC=gcc-${{matrix.config.version}}" >> $GITHUB_ENV
42-
echo "CXX=g++-${{matrix.config.version}}" >> $GITHUB_ENV
45+
echo "CC=gcc" >> $GITHUB_ENV
46+
echo "CXX=g++" >> $GITHUB_ENV
4347
44-
- name: Set enviroment variables (Linux+Clang)
48+
- name: Set environment variables (Linux+Clang)
4549
if: ${{ matrix.config.compiler == 'clang' }}
4650
shell: bash
4751
run: |
48-
echo "CC=clang-${{matrix.config.version}}" >> $GITHUB_ENV
49-
echo "CXX=clang++-${{matrix.config.version}}" >> $GITHUB_ENV
52+
echo "CC=clang" >> $GITHUB_ENV
53+
echo "CXX=clang++" >> $GITHUB_ENV
5054
5155
- name: Configure (Ubuntu)
5256
if: ${{ startsWith(matrix.config.os, 'ubuntu') }}
@@ -64,9 +68,7 @@ jobs:
6468
6569
- name: Configure (Windows)
6670
if: ${{ startsWith(matrix.config.os, 'windows') }}
67-
shell: cmd
6871
run: |
69-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
7072
mkdir ..\build
7173
cmake -S. -B../build -GNinja -DCMAKE_BUILD_TYPE=${{matrix.config.build-type}} -DCMAKE_CXX_STANDARD=${{matrix.config.cxxstd}}
7274
@@ -78,9 +80,7 @@ jobs:
7880
7981
- name: Build (Windows)
8082
if: ${{ startsWith(matrix.config.os, 'windows') }}
81-
shell: cmd
8283
run: |
83-
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
8484
cmake --build ../build/
8585
8686
- name: Test

‎.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

‎CMakeLists.txt‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ include(cmake/CPM.cmake)
2222
# Dependencies
2323

2424
# https://github.com/stlab/copy-on-write/releases
25-
CPMAddPackage("gh:stlab/copy-on-write@1.0.4")
25+
CPMAddPackage("gh:stlab/copy-on-write@1.1.0")
2626

2727
# https://github.com/stlab/enum-ops/releases
28-
CPMAddPackage(gh:stlab/enum-ops@1.0.4)
28+
CPMAddPackage(gh:stlab/enum-ops@1.2.0)
2929
# CPMAddPackage(NAME enum-ops
3030
# URL "${CMAKE_SOURCE_DIR}/../enum-ops"
3131
# )
@@ -52,9 +52,9 @@ endif()
5252
# https://github.com/boostorg/boost/releases
5353
CPMAddPackage(
5454
NAME Boost
55-
VERSION 1.88.0
56-
URL https://github.com/boostorg/boost/releases/download/boost-1.88.0/boost-1.88.0-cmake.7z
57-
URL_HASH SHA256=feba537f6d32c062ed0f26b4d6e5b8e8450d51ef81492369a101ab99fcead278
55+
VERSION 1.90.0
56+
URL https://github.com/boostorg/boost/releases/download/boost-1.90.0/boost-1.90.0-cmake.7z
57+
URL_HASH SHA256=218e74c4aa362a994b7b7a23b2920f455a00205c656405fcf262cf60b8871921
5858
OPTIONS
5959
"BOOST_ENABLE_CMAKE ON"
6060
"CMAKE_CXX_CLANG_TIDY ;"
@@ -90,8 +90,9 @@ if(BUILD_DOCS)
9090

9191
if(DOXYGEN_FOUND)
9292
# Download doxygen-awesome-css theme via CPM
93+
# https://github.com/jothepro/doxygen-awesome-css
9394
CPMAddPackage(
94-
URI gh:jothepro/doxygen-awesome-css@2.3.4
95+
URI gh:jothepro/doxygen-awesome-css@2.4.1
9596
DOWNLOAD_ONLY YES
9697
)
9798
set(AWESOME_CSS_DIR ${doxygen-awesome-css_SOURCE_DIR})

0 commit comments

Comments
 (0)