Skip to content

Commit d2d9d0a

Browse files
florianbeckerflorianbecker
committed
Upgrade dependencies
Fix workflows
1 parent 605a170 commit d2d9d0a

File tree

8 files changed

+110
-51
lines changed

8 files changed

+110
-51
lines changed

‎.github/workflows/linux-codeql.yml‎

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,20 @@ jobs:
1919
ubuntu-20.04-gcc-10,
2020
ubuntu-22.04-gcc-11,
2121
ubuntu-22.04-gcc-12,
22+
ubuntu-24.04-gcc-12,
23+
ubuntu-24.04-gcc-13,
24+
ubuntu-24.04-gcc-14,
2225
ubuntu-20.04-clang-8,
2326
ubuntu-20.04-clang-9,
2427
ubuntu-20.04-clang-10,
2528
ubuntu-22.04-clang-11,
2629
ubuntu-22.04-clang-12,
2730
ubuntu-22.04-clang-13,
2831
ubuntu-22.04-clang-14,
29-
ubuntu-22.04-clang-15
32+
ubuntu-22.04-clang-15,
33+
ubuntu-24.04-clang-16,
34+
ubuntu-24.04-clang-17,
35+
ubuntu-24.04-clang-18
3036
]
3137
config: [Debug, Release]
3238
include:
@@ -50,6 +56,21 @@ jobs:
5056
compiler: gcc
5157
version: 12
5258

59+
- name: ubuntu-24.04-gcc-12
60+
os: ubuntu-24.04
61+
compiler: gcc
62+
version: 12
63+
64+
- name: ubuntu-24.04-gcc-13
65+
os: ubuntu-24.04
66+
compiler: gcc
67+
version: 13
68+
69+
- name: ubuntu-24.04-gcc-14
70+
os: ubuntu-24.04
71+
compiler: gcc
72+
version: 14
73+
5374
- name: ubuntu-20.04-clang-8
5475
os: ubuntu-20.04
5576
compiler: clang
@@ -90,17 +111,26 @@ jobs:
90111
compiler: clang
91112
version: 15
92113

114+
- name: ubuntu-24.04-clang-16
115+
os: ubuntu-24.04
116+
compiler: clang
117+
version: 16
118+
119+
- name: ubuntu-24.04-clang-17
120+
os: ubuntu-24.04
121+
compiler: clang
122+
version: 17
123+
124+
- name: ubuntu-24.04-clang-18
125+
os: ubuntu-24.04
126+
compiler: clang
127+
version: 18
128+
93129
steps:
94130
- uses: actions/checkout@v4
95131

96132
- name: Dependencies
97133
run: |
98-
if [ "${{matrix.version}}" = "15" ]; then
99-
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|gpg --dearmor > llvm-snapshot.gpg
100-
sudo mv llvm-snapshot.gpg /etc/apt/trusted.gpg.d/
101-
sudo apt-add-repository "deb https://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"
102-
fi
103-
104134
sudo apt update
105135
sudo apt install -y ninja-build
106136
sudo apt install -y doxygen graphviz

‎.github/workflows/linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ jobs:
177177
if: matrix.compiler == 'clang' && matrix.config == 'Debug'
178178
uses: actions/upload-artifact@v4
179179
with:
180-
name: coverage-linux
180+
name: coverage-linux.${{matrix.compiler}}-${{matrix.version}}
181181
path: |
182182
${{runner.workspace}}/build/tests/coverage.${{matrix.compiler}}-${{matrix.version}}.txt
183183
${{runner.workspace}}/build/tests/coverage.overview.${{matrix.compiler}}-${{matrix.version}}.txt

‎.github/workflows/macos-codeql.yml‎

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,36 +15,50 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
name: [
18-
macos-12-xcode-13-x86_64,
19-
# macos-12-xcode-13-arm64,
20-
macos-12-xcode-14-x86_64
21-
# macos-12-xcode-14-arm64
18+
macos-13-xcode-14-x86_64,
19+
macos-13-xcode-14-arm64,
20+
macos-13-xcode-15-x86_64,
21+
macos-13-xcode-15-arm64,
22+
macos-14-xcode-16-x86_64,
23+
macos-14-xcode-16-arm64
2224
]
2325
config: [Debug, Release]
2426
include:
25-
- name: macos-12-xcode-13-x86_64
26-
os: macos-12
27+
- name: macos-13-xcode-15-x86_64
28+
os: macos-13
2729
compiler: xcode
28-
version: "13.4"
30+
version: "14.3"
2931
architecture: x86_64
3032

31-
# - name: macos-12-xcode-13-arm64
32-
# os: macos-12
33-
# compiler: xcode
34-
# version: "13.4"
35-
# architecture: arm64
33+
- name: macos-13-xcode-15-arm64
34+
os: macos-13
35+
compiler: xcode
36+
version: "14.3"
37+
architecture: arm64
3638

37-
- name: macos-12-xcode-14-x86_64
38-
os: macos-12
39+
- name: macos-13-xcode-15-x86_64
40+
os: macos-13
3941
compiler: xcode
40-
version: "14.2"
42+
version: "15.2"
4143
architecture: x86_64
4244

43-
# - name: macos-12-xcode-14-arm64
44-
# os: macos-12
45-
# compiler: xcode
46-
# version: "14.2"
47-
# architecture: arm64
45+
- name: macos-13-xcode-15-arm64
46+
os: macos-13
47+
compiler: xcode
48+
version: "15.2"
49+
architecture: arm64
50+
51+
- name: macos-14-xcode-16-x86_64
52+
os: macos-14
53+
compiler: xcode
54+
version: "15.4"
55+
architecture: x86_64
56+
57+
- name: macos-14-xcode-16-arm64
58+
os: macos-14
59+
compiler: xcode
60+
version: "15.4"
61+
architecture: arm64
4862

4963
steps:
5064
- uses: actions/checkout@v4

‎.github/workflows/macos.yml‎

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,35 +15,49 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
name: [
18-
macos-12-xcode-13-x86_64,
19-
# macos-12-xcode-13-arm64,
20-
macos-12-xcode-14-x86_64
21-
# macos-12-xcode-14-arm64
18+
macos-13-xcode-14-x86_64,
19+
# macos-13-xcode-14-arm64,
20+
macos-13-xcode-15-x86_64,
21+
# macos-13-xcode-15-arm64,
22+
macos-14-xcode-16-x86_64
23+
# macos-14-xcode-16-arm64
2224
]
2325
config: [Debug, Release]
2426
include:
25-
- name: macos-12-xcode-13-x86_64
26-
os: macos-12
27+
- name: macos-13-xcode-14-x86_64
28+
os: macos-13
2729
compiler: xcode
28-
version: "13.4"
30+
version: "14.3"
2931
architecture: x86_64
3032

31-
# - name: macos-12-xcode-13-arm64
32-
# os: macos-12
33+
# - name: macos-13-xcode-14-arm64
34+
# os: macos-13
3335
# compiler: xcode
34-
# version: "13.4"
36+
# version: "14.3"
3537
# architecture: arm64
3638

37-
- name: macos-12-xcode-14-x86_64
38-
os: macos-12
39+
- name: macos-13-xcode-15-x86_64
40+
os: macos-13
3941
compiler: xcode
40-
version: "14.2"
42+
version: "15.2"
4143
architecture: x86_64
4244

43-
# - name: macos-12-xcode-14-arm64
44-
# os: macos-12
45+
# - name: macos-13-xcode-15-arm64
46+
# os: macos-13
4547
# compiler: xcode
46-
# version: "14.2"
48+
# version: "15.2"
49+
# architecture: arm64
50+
51+
- name: macos-14-xcode-16-x86_64
52+
os: macos-14
53+
compiler: xcode
54+
version: "15.4"
55+
architecture: x86_64
56+
57+
# - name: macos-14-xcode-16-arm64
58+
# os: macos-14
59+
# compiler: xcode
60+
# version: "15.4"
4761
# architecture: arm64
4862

4963
steps:
@@ -88,7 +102,7 @@ jobs:
88102
# if: matrix.config == 'Debug' && matrix.architecture != 'arm64'
89103
# uses: actions/upload-artifact@v4
90104
# with:
91-
# name: coverage-macos
105+
# name: coverage-macos.${{matrix.compiler}}-${{matrix.version}}
92106
# path: |
93107
# ${{runner.workspace}}/build/tests/coverage.${{matrix.compiler}}-${{matrix.version}}.txt
94108
# ${{runner.workspace}}/build/tests/coverage.overview.${{matrix.compiler}}-${{matrix.version}}.txt

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
*.user*
22
.scannerwork
33
.idea
4+
+*build*

‎cmake/external/googletest.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ set(GOOGLETEST_INCLUDE_DIR ${GOOGLETEST_INSTALL}/include)
4444
ExternalProject_Add(GTest
4545
PREFIX ${GOOGLETEST_SRC}
4646
GIT_REPOSITORY https://github.com/google/googletest.git
47-
GIT_TAG v1.14.0
47+
GIT_TAG v1.15.2
4848
GIT_SHALLOW 1
4949
CMAKE_ARGS
5050
-DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}

‎cmake/external/icu.cmake‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ endif()
3535
include(FetchContent)
3636

3737
FetchContent_Declare(icu-data
38-
URL https://github.com/unicode-org/icu/releases/download/release-72-1/icu4c-72_1-data.zip
39-
URL_HASH SHA512=9c7a85d22bcd27ccb8503ce3a64a0f88c6c495d6c0619398ec3a693f156dadd22bbc5c2993730cf6f25b4869206562f875c35ba35c462c6d3420d5d4e8de4faf
38+
URL https://github.com/unicode-org/icu/releases/download/release-76-1/icu4c-76_1-data.zip
39+
URL_HASH SHA512=db029885e4bb274ebabb71de35adfd16f463a1d23b30ee909991b0e443d9dae374f2289924358e9042b1159167626b314a94a482e1e01fe097f7b6a9695ec119
4040
SOURCE_DIR ${CMAKE_BINARY_DIR}/_deps/icu-src/src/ICU/data
4141
)
4242

@@ -110,8 +110,8 @@ endif()
110110
ExternalProject_Add(ICU
111111
# DEPENDS icu-data
112112
PREFIX ${ICU_SRC}
113-
URL https://github.com/unicode-org/icu/releases/download/release-72-1/icu4c-72_1-src.zip
114-
URL_HASH SHA512=d4bb1baed99674074f8af024dd159898eddaf4d71bc90f8d95b8448e96aac4b4e8358f755a516bfaf84baa34bf8657dc994459ef3bd72f54496b9ce2b0bd4636
113+
URL https://github.com/unicode-org/icu/releases/download/release-76-1/icu4c-76_1-src.zip
114+
URL_HASH SHA512=bd8519973e494d67b278689fa538d9756d6edcd95b82e687660bfdf23c68582c1b525e8aac73d23e22b39b3b481c918f40145e2b148267e8a6c0bdcb48d36645
115115
CONFIGURE_COMMAND ${ICU_CONFIGURE_COMMAND}
116116
BUILD_COMMAND ${ICU_BUILD_COMMAND}
117117
TEST_COMMAND ""

‎cmake/fetch/modern.cpp.core.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ set(CORE_BUILD_TESTS OFF)
3636

3737
FetchContent_Declare(modern.cpp.core
3838
GIT_REPOSITORY https://github.com/VXAPPS/modern.cpp.core.git
39-
GIT_TAG master
39+
GIT_TAG v0.6.2
4040
GIT_SHALLOW 1
4141
)
4242

0 commit comments

Comments
 (0)