Skip to content

Commit 28a8ec2

Browse files
committed
Sync from upstream.
2 parents 102f83d + ced7f38 commit 28a8ec2

File tree

2 files changed

+48
-19
lines changed

2 files changed

+48
-19
lines changed

.drone.jsonnet

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ local linux_pipeline(name, image, environment, packages = "", sources = [], arch
3232
commands:
3333
[
3434
'set -e',
35+
'uname -a',
36+
'echo $DRONE_STAGE_MACHINE',
3537
'wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -',
3638
] +
3739
(if sources != [] then [ ('apt-add-repository "' + source + '"') for source in sources ] else []) +
@@ -146,36 +148,36 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
146148
linux_pipeline(
147149
"Linux 22.04 GCC 12 32/64",
148150
"cppalliance/droneubuntu2204:1",
149-
{ TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '11,14,17,20', ADDRMD: '32,64' },
151+
{ TOOLSET: 'gcc', COMPILER: 'g++-12', CXXSTD: '11,14,17,20,2b', ADDRMD: '32,64' },
150152
"g++-12-multilib",
151153
),
152154

153155
linux_pipeline(
154-
"Linux 23.04 GCC 13 32 UBSAN",
156+
"Linux 23.04 GCC 13 32/64 UBSAN",
155157
"cppalliance/droneubuntu2304:1",
156-
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + ubsan,
158+
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32,64' } + ubsan,
157159
"g++-13-multilib",
158160
),
159161

160162
linux_pipeline(
161-
"Linux 23.04 GCC 13 64 UBSAN",
163+
"Linux 23.04 GCC 13 32 ASAN",
162164
"cppalliance/droneubuntu2304:1",
163-
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + ubsan,
165+
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + asan,
164166
"g++-13-multilib",
165167
),
166168

167169
linux_pipeline(
168-
"Linux 23.04 GCC 13 32 ASAN",
169-
"cppalliance/droneubuntu2304:1",
170-
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + asan,
171-
"g++-13-multilib",
170+
"Linux 24.04 GCC 14 UBSAN",
171+
"cppalliance/droneubuntu2404:1",
172+
{ TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b' } + ubsan,
173+
"g++-14-multilib",
172174
),
173175

174176
linux_pipeline(
175-
"Linux 23.04 GCC 13 64 ASAN",
176-
"cppalliance/droneubuntu2304:1",
177-
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + asan,
178-
"g++-13-multilib",
177+
"Linux 24.04 GCC 14 ASAN",
178+
"cppalliance/droneubuntu2404:1",
179+
{ TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b' } + asan,
180+
"g++-14-multilib",
179181
),
180182

181183
linux_pipeline(
@@ -206,6 +208,20 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
206208
"clang-17",
207209
),
208210

211+
linux_pipeline(
212+
"Linux 24.04 Clang 18 UBSAN",
213+
"cppalliance/droneubuntu2404:1",
214+
{ TOOLSET: 'clang', COMPILER: 'clang++-18', CXXSTD: '11,14,17,20,2b' } + ubsan,
215+
"clang-18",
216+
),
217+
218+
linux_pipeline(
219+
"Linux 24.04 Clang 18 ASAN",
220+
"cppalliance/droneubuntu2404:1",
221+
{ TOOLSET: 'clang', COMPILER: 'clang++-18', CXXSTD: '11,14,17,20,2b' } + asan,
222+
"clang-18",
223+
),
224+
209225
macos_pipeline(
210226
"MacOS 10.15 Xcode 12.2 UBSAN",
211227
{ TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '11,14,1z' } + ubsan,

.github/workflows/ci.yml

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
address-model: 32,64
7070
- toolset: gcc-11
7171
cxxstd: "11,14,17,20"
72-
os: ubuntu-20.04
72+
os: ubuntu-22.04
7373
install: g++-11-multilib
7474
address-model: 32,64
7575
- toolset: gcc-12
@@ -83,6 +83,12 @@ jobs:
8383
os: ubuntu-latest
8484
install: g++-13-multilib
8585
address-model: 32,64
86+
- toolset: gcc-14
87+
cxxstd: "11,14,17,20,2b"
88+
container: ubuntu:24.04
89+
os: ubuntu-latest
90+
install: g++-14-multilib
91+
address-model: 32,64
8692
- toolset: clang
8793
compiler: clang++-3.9
8894
cxxstd: "11,14"
@@ -167,8 +173,11 @@ jobs:
167173
os: ubuntu-latest
168174
install: clang-17
169175
- toolset: clang
170-
cxxstd: "11,14,17,2a"
171-
os: macos-11
176+
compiler: clang++-18
177+
cxxstd: "11,14,17,20,2b"
178+
container: ubuntu:24.04
179+
os: ubuntu-latest
180+
install: clang-18
172181
- toolset: clang
173182
cxxstd: "11,14,17,20,2b"
174183
os: macos-12
@@ -187,6 +196,10 @@ jobs:
187196
shell: bash
188197

189198
steps:
199+
- name: Enable Node 16
200+
run: |
201+
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
202+
190203
- uses: actions/checkout@v3
191204

192205
- name: Setup container environment
@@ -300,9 +313,9 @@ jobs:
300313
include:
301314
- os: ubuntu-20.04
302315
- os: ubuntu-22.04
303-
- os: macos-11
304316
- os: macos-12
305317
- os: macos-13
318+
- os: macos-14
306319

307320
runs-on: ${{matrix.os}}
308321

@@ -348,9 +361,9 @@ jobs:
348361
include:
349362
- os: ubuntu-20.04
350363
- os: ubuntu-22.04
351-
- os: macos-11
352364
- os: macos-12
353365
- os: macos-13
366+
- os: macos-14
354367

355368
runs-on: ${{matrix.os}}
356369

@@ -406,9 +419,9 @@ jobs:
406419
include:
407420
- os: ubuntu-20.04
408421
- os: ubuntu-22.04
409-
- os: macos-11
410422
- os: macos-12
411423
- os: macos-13
424+
- os: macos-14
412425

413426
runs-on: ${{matrix.os}}
414427

0 commit comments

Comments
 (0)