Skip to content

Commit 03f0ff3

Browse files
ashtumashtum
committed
Updade build.yml
1 parent 3772c11 commit 03f0ff3

File tree

4 files changed

+45
-35
lines changed

4 files changed

+45
-35
lines changed

‎.github/workflows/build.yml

Lines changed: 41 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,11 @@ jobs:
7373
cxxstd: 11,14,17,20,2b
7474
os: ubuntu-24.04
7575
install: g++-14
76+
- toolset: gcc-15
77+
cxxstd: 11,14,17,20,23,2c
78+
os: ubuntu-latest
79+
container: ubuntu:25.04
80+
install: g++-15
7681
- toolset: clang
7782
compiler: clang++-3.5
7883
cxxstd: 11
@@ -116,81 +121,87 @@ jobs:
116121
container: ubuntu:18.04
117122
install: clang-5.0
118123
- toolset: clang
119-
install: clang-6.0
120124
compiler: clang++-6.0
121125
cxxstd: 11,14,17
122126
os: ubuntu-24.04
123127
container: ubuntu:18.04
128+
install: clang-6.0
124129
- toolset: clang
125-
install: clang-7
126130
compiler: clang++-7
127131
cxxstd: 11,14
128132
os: ubuntu-24.04
129133
container: ubuntu:18.04
134+
install: clang-7
130135
- toolset: clang
131-
install: clang-8
132136
compiler: clang++-8
133137
cxxstd: 11,14,17
134138
os: ubuntu-24.04
135139
container: ubuntu:18.04
140+
install: clang-8
136141
- toolset: clang
137-
install: clang-9
138142
compiler: clang++-9
139143
cxxstd: 11,14,17,2a
140144
os: ubuntu-24.04
141145
container: ubuntu:18.04
146+
install: clang-9
142147
- toolset: clang
143-
install: clang-10
144148
compiler: clang++-10
145149
cxxstd: 11,14,17,2a
146150
os: ubuntu-24.04
147151
container: ubuntu:20.04
152+
install: clang-10
148153
- toolset: clang
149-
install: clang-11
150154
compiler: clang++-11
151155
cxxstd: 11,14,17,2a
152156
os: ubuntu-24.04
153157
container: ubuntu:20.04
158+
install: clang-11
154159
- toolset: clang
155-
install: clang-12
156160
compiler: clang++-12
157161
cxxstd: 11,14,17,20
158162
os: ubuntu-22.04
163+
install: clang-12
159164
- toolset: clang
160-
install: clang-13
161165
compiler: clang++-13
162166
cxxstd: 11,14,17,20
163167
os: ubuntu-22.04
168+
install: clang-13
164169
- toolset: clang
165-
install: clang-14
166170
compiler: clang++-14
167171
cxxstd: 11,14,17,20
168172
os: ubuntu-22.04
173+
install: clang-14
169174
- toolset: clang
170-
install: clang-15
171175
compiler: clang++-15
172176
cxxstd: 11,14,17,20,2b
173177
os: ubuntu-22.04
178+
install: clang-15
174179
- toolset: clang
175-
install: clang-16
176180
compiler: clang++-16
177181
cxxstd: 11,14,17,20 # no 2b: https://github.com/llvm/llvm-project/issues/97842
178182
os: ubuntu-24.04
183+
install: clang-16
179184
- toolset: clang
180-
install: clang-17
181185
compiler: clang++-17
182186
cxxstd: 11,14,17,20 # no 2b: https://github.com/llvm/llvm-project/issues/97842
183187
os: ubuntu-24.04
188+
install: clang-17
184189
- toolset: clang
185-
install: clang-18
186190
compiler: clang++-18
187191
cxxstd: 11,14,17,20,2b
188192
os: ubuntu-24.04
193+
install: clang-18
189194
- toolset: clang
190-
install: clang-19
191195
compiler: clang++-19
192196
cxxstd: 11,14,17,20,2b
193197
os: ubuntu-24.04
198+
install: clang-19
199+
- toolset: clang
200+
compiler: clang++-20
201+
cxxstd: 11,14,17,20,23,2c
202+
os: ubuntu-latest
203+
container: ubuntu:25.04
204+
install: clang-20
194205
- toolset: clang
195206
os: macos-13
196207
cxxstd: 11,14,17,20,2b
@@ -268,22 +279,6 @@ jobs:
268279
fail-fast: false
269280
matrix:
270281
include:
271-
- toolset: msvc-14.2
272-
cxxstd: 14,17
273-
addrmd: 32
274-
os: windows-2019
275-
- toolset: msvc-14.2
276-
cxxstd: 20,latest
277-
addrmd: 32
278-
os: windows-2019
279-
- toolset: msvc-14.2
280-
cxxstd: 14,17
281-
addrmd: 64
282-
os: windows-2019
283-
- toolset: msvc-14.2
284-
cxxstd: 20,latest
285-
addrmd: 64
286-
os: windows-2019
287282
- toolset: msvc-14.3
288283
cxxstd: 14,17
289284
addrmd: 32
@@ -310,6 +305,19 @@ jobs:
310305
addrmd: 64
311306
os: windows-2022
312307

308+
# The windows-2022 image comes with GCC 12, which causes a
309+
# `file too big` error even when using `-Wa,-mbig-obj` and
310+
# `debug-symbols=off`.
311+
312+
# - toolset: gcc
313+
# cxxstd: "11,14"
314+
# addrmd: 64
315+
# os: windows-2022
316+
# - toolset: gcc
317+
# cxxstd: "17,2a"
318+
# addrmd: 64
319+
# os: windows-2022
320+
313321
needs: [runner-selection]
314322
runs-on: ${{ fromJSON(needs.runner-selection.outputs.labelmatrix)[matrix.os] }}
315323

@@ -532,7 +540,7 @@ jobs:
532540
fail-fast: false
533541
matrix:
534542
include:
535-
- os: windows-2019
543+
- os: windows-2025
536544
- os: windows-2022
537545

538546
runs-on: ${{matrix.os}}
@@ -581,7 +589,7 @@ jobs:
581589
fail-fast: false
582590
matrix:
583591
include:
584-
- os: windows-2019
592+
- os: windows-2025
585593
- os: windows-2022
586594

587595
runs-on: ${{matrix.os}}
@@ -648,7 +656,7 @@ jobs:
648656
fail-fast: false
649657
matrix:
650658
include:
651-
- os: windows-2019
659+
- os: windows-2025
652660
- os: windows-2022
653661

654662
runs-on: ${{matrix.os}}

‎cmake/toolchains/common.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_RELWITHDEBINFO ON CACHE STRING "")
1212

1313
# Compiler definitions.
1414
if(WIN32)
15-
add_definitions(-D_WIN32_WINNT=0x0601 -D_CRT_SECURE_NO_WARNINGS)
15+
add_definitions(-D_WIN32_WINNT=0x0A00 -D_CRT_SECURE_NO_WARNINGS)
1616
endif()
1717

1818
# Project options.

‎test/Jamfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ local requirements =
5555
<target-os>solaris:<define>__EXTENSIONS__
5656
<target-os>solaris:<library>socket
5757
<target-os>solaris:<library>nsl
58-
<target-os>windows:<define>_WIN32_WINNT=0x0601
58+
<target-os>windows:<define>_WIN32_WINNT=0x0A00
5959
<target-os>windows,<toolset>gcc:<library>ws2_32
6060
<target-os>windows,<toolset>gcc:<library>mswsock
6161
<target-os>windows,<toolset>gcc-cygwin:<define>__USE_W32_SOCKETS

‎tools/get-boost.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ git submodule update --init --depth 20 --jobs 4 \
4141
libs/static_string \
4242
libs/system \
4343
libs/throw_exception \
44+
libs/tokenizer \
4445
libs/type_traits \
4546
libs/utility \
4647
libs/winapi \
@@ -80,6 +81,7 @@ git submodule update --init --depth 20 --jobs 4 \
8081
libs/range \
8182
libs/ratio \
8283
libs/rational \
84+
libs/regex \
8385
libs/thread \
8486
libs/tuple \
8587
libs/type_index \

0 commit comments

Comments
 (0)