Skip to content

Commit f049c57

Browse files
authored
Merge pull request #581 from cppalliance/macos-11
Remove macos-11 and add newly released toolchains
2 parents c568bca + e4fca22 commit f049c57

File tree

2 files changed

+42
-20
lines changed

2 files changed

+42
-20
lines changed

.drone.jsonnet

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,17 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
9898
[
9999

100100
linux_pipeline(
101-
"Linux 23.04 GCC 13 GNU 32 ASAN",
102-
"cppalliance/droneubuntu2304:1",
103-
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '03,11,14,17,20,23', ADDRMD: '32', CXXFLAGS: "-fexcess-precision=fast", CXXSTDDIALECT: "gnu" } + asan,
104-
"g++-13-multilib",
101+
"Linux 24.04 GCC 14 GNU 32 ASAN",
102+
"cppalliance/droneubuntu2404:1",
103+
{ TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '03,11,14,17,20,23', ADDRMD: '32', CXXFLAGS: "-fexcess-precision=fast", CXXSTDDIALECT: "gnu" } + asan,
104+
"g++-14-multilib",
105105
),
106106

107107
linux_pipeline(
108-
"Linux 23.04 GCC 13 GNU 64 ASAN",
109-
"cppalliance/droneubuntu2304:1",
110-
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '03,11,14,17,20,23', ADDRMD: '64', CXXFLAGS: "-fexcess-precision=fast", CXXSTDDIALECT: "gnu" } + asan,
111-
"g++-13-multilib",
108+
"Linux 24.04 GCC 14 GNU 64 ASAN",
109+
"cppalliance/droneubuntu2404:1",
110+
{ TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '03,11,14,17,20,23', ADDRMD: '64', CXXFLAGS: "-fexcess-precision=fast", CXXSTDDIALECT: "gnu" } + asan,
111+
"g++-14-multilib",
112112
),
113113

114114
linux_pipeline(
@@ -173,19 +173,33 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
173173
),
174174

175175
linux_pipeline(
176-
"Linux 23.04 GCC 13 32/64",
177-
"cppalliance/droneubuntu2304:1",
176+
"Linux 24.04 GCC 13 32/64",
177+
"cppalliance/droneubuntu2404:1",
178178
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '03,11,14,17,20,23', ADDRMD: '32,64', CXXFLAGS: "-fexcess-precision=fast" },
179179
"g++-13-multilib",
180180
),
181181

182182
linux_pipeline(
183-
"Linux 23.04 GCC 13 GNU 32/64",
184-
"cppalliance/droneubuntu2304:1",
183+
"Linux 24.04 GCC 13 GNU 32/64",
184+
"cppalliance/droneubuntu2404:1",
185185
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '03,11,14,17,20,23', ADDRMD: '32,64', CXXFLAGS: "-fexcess-precision=fast", CXXSTDDIALECT: "gnu" },
186186
"g++-13-multilib",
187187
),
188188

189+
linux_pipeline(
190+
"Linux 24.04 GCC 14 32/64",
191+
"cppalliance/droneubuntu2404:1",
192+
{ TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '03,11,14,17,20,23', ADDRMD: '32,64', CXXFLAGS: "-fexcess-precision=fast" },
193+
"g++-14-multilib",
194+
),
195+
196+
linux_pipeline(
197+
"Linux 24.04 GCC 14 GNU 32/64",
198+
"cppalliance/droneubuntu2404:1",
199+
{ TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '03,11,14,17,20,23', ADDRMD: '32,64', CXXFLAGS: "-fexcess-precision=fast", CXXSTDDIALECT: "gnu" },
200+
"g++-14-multilib",
201+
),
202+
189203
linux_pipeline(
190204
"Linux 18.04 GCC 7* 32 03",
191205
"cppalliance/droneubuntu1804:1",
@@ -329,13 +343,21 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
329343
),
330344

331345
linux_pipeline(
332-
"Linux 23.10 Clang 17",
333-
"cppalliance/droneubuntu2310:1",
346+
"Linux 24.04 Clang 17",
347+
"cppalliance/droneubuntu2404:1",
334348
{ TOOLSET: 'clang', COMPILER: 'clang++-17', CXXSTD: '03,11,14,17,20,2b' },
335349
"clang-17",
336350
["deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main"],
337351
),
338352

353+
linux_pipeline(
354+
"Linux 24.04 Clang 18",
355+
"cppalliance/droneubuntu2404:1",
356+
{ TOOLSET: 'clang', COMPILER: 'clang++-18', CXXSTD: '03,11,14,17,20,2b' },
357+
"clang-18",
358+
["deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main"],
359+
),
360+
339361
macos_pipeline(
340362
"MacOS 10.15 Xcode 12.2 UBSAN",
341363
{ TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,17,2a' } + ubsan,

.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,6 @@ jobs:
238238
- libc++-14-dev
239239
- libc++abi-14-dev
240240

241-
- toolset: clang
242-
cxxstd: "03,11,14,17,2a"
243-
os: macos-11
244241
- toolset: clang
245242
cxxstd: "03,11,14,17,20,2b"
246243
os: macos-12
@@ -518,8 +515,9 @@ jobs:
518515
include:
519516
- os: ubuntu-20.04
520517
- os: ubuntu-22.04
521-
- os: macos-11
522518
- os: macos-12
519+
- os: macos-13
520+
- os: macos-14
523521

524522
runs-on: ${{matrix.os}}
525523

@@ -566,8 +564,9 @@ jobs:
566564
include:
567565
- os: ubuntu-20.04
568566
- os: ubuntu-22.04
569-
- os: macos-11
570567
- os: macos-12
568+
- os: macos-13
569+
- os: macos-14
571570

572571
runs-on: ${{matrix.os}}
573572

@@ -624,8 +623,9 @@ jobs:
624623
include:
625624
- os: ubuntu-20.04
626625
- os: ubuntu-22.04
627-
- os: macos-11
628626
- os: macos-12
627+
- os: macos-13
628+
- os: macos-14
629629

630630
runs-on: ${{matrix.os}}
631631

0 commit comments

Comments
 (0)