Skip to content

Commit f78343e

Browse files
grafikrobotgrafikrobot
committed
Sync from upstream.
2 parents ea43949 + f5cd36a commit f78343e

File tree

5 files changed

+35
-29
lines changed

5 files changed

+35
-29
lines changed

‎.drone.jsonnet

+15-22
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
9999
linux_pipeline(
100100
"Linux 16.04 GCC 4.8 32/64",
101101
"cppalliance/droneubuntu1604:1",
102-
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '11', ADDRMD: '32,64' },
102+
{ TOOLSET: 'gcc', COMPILER: 'g++-4.8', CXXSTD: '11', ADDRMD: '32,64' },
103103
"g++-4.8-multilib",
104104
),
105105

@@ -177,44 +177,37 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
177177
),
178178

179179
linux_pipeline(
180-
"Linux 23.04 GCC 13 32 ASAN",
180+
"Linux 23.04 GCC 13 32/64",
181181
"cppalliance/droneubuntu2304:1",
182-
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + asan,
182+
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32,64' },
183183
"g++-13-multilib",
184184
),
185185

186186
linux_pipeline(
187-
"Linux 23.04 GCC 13 64 ASAN",
188-
"cppalliance/droneubuntu2304:1",
189-
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + asan,
190-
"g++-13-multilib",
191-
),
192-
193-
linux_pipeline(
194-
"Linux 23.04 GCC 13 32 UBSAN",
195-
"cppalliance/droneubuntu2304:1",
196-
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + ubsan,
197-
"g++-13-multilib",
187+
"Linux 24.04 GCC 14 32 ASAN",
188+
"cppalliance/droneubuntu2404:1",
189+
{ TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + asan,
190+
"g++-14-multilib",
198191
),
199192

200193
linux_pipeline(
201-
"Linux 23.04 GCC 13 64 UBSAN",
202-
"cppalliance/droneubuntu2304:1",
203-
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + ubsan,
204-
"g++-13-multilib",
194+
"Linux 24.04 GCC 14 64 ASAN",
195+
"cppalliance/droneubuntu2404:1",
196+
{ TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + asan,
197+
"g++-14-multilib",
205198
),
206199

207200
linux_pipeline(
208-
"Linux 24.04 GCC 14 32",
201+
"Linux 24.04 GCC 14 32 UBSAN",
209202
"cppalliance/droneubuntu2404:1",
210-
{ TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' },
203+
{ TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '32' } + ubsan,
211204
"g++-14-multilib",
212205
),
213206

214207
linux_pipeline(
215-
"Linux 24.04 GCC 14 64",
208+
"Linux 24.04 GCC 14 64 UBSAN",
216209
"cppalliance/droneubuntu2404:1",
217-
{ TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' },
210+
{ TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '11,14,17,20,2b', ADDRMD: '64' } + ubsan,
218211
"g++-14-multilib",
219212
),
220213

‎.github/workflows/ci.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,6 @@ jobs:
159159
container: ubuntu:24.04
160160
os: ubuntu-latest
161161
install: clang-18
162-
- toolset: clang
163-
cxxstd: "11,14,17,2a"
164-
os: macos-11
165162
- toolset: clang
166163
cxxstd: "11,14,17,20,2b"
167164
os: macos-12
@@ -180,6 +177,10 @@ jobs:
180177
shell: bash
181178

182179
steps:
180+
- name: Enable Node 16
181+
run: |
182+
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
183+
183184
- uses: actions/checkout@v3
184185

185186
- name: Setup container environment
@@ -292,9 +293,9 @@ jobs:
292293
include:
293294
- os: ubuntu-20.04
294295
- os: ubuntu-22.04
295-
- os: macos-11
296296
- os: macos-12
297297
- os: macos-13
298+
- os: macos-14
298299

299300
runs-on: ${{matrix.os}}
300301

@@ -340,9 +341,9 @@ jobs:
340341
include:
341342
- os: ubuntu-20.04
342343
- os: ubuntu-22.04
343-
- os: macos-11
344344
- os: macos-12
345345
- os: macos-13
346+
- os: macos-14
346347

347348
runs-on: ${{matrix.os}}
348349

@@ -398,9 +399,9 @@ jobs:
398399
include:
399400
- os: ubuntu-20.04
400401
- os: ubuntu-22.04
401-
- os: macos-11
402402
- os: macos-12
403403
- os: macos-13
404+
- os: macos-14
404405

405406
runs-on: ${{matrix.os}}
406407

‎include/boost/variant2/variant.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ struct monostate
8383
{
8484
};
8585

86-
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1940)
86+
#if !BOOST_WORKAROUND(BOOST_MSVC, < 1950)
8787

8888
constexpr bool operator<(monostate, monostate) noexcept { return false; }
8989
constexpr bool operator>(monostate, monostate) noexcept { return false; }

‎test/variant_json_value_from.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
// Distributed under the Boost Software License, Version 1.0.
33
// https://www.boost.org/LICENSE_1_0.txt
44

5+
#include <boost/config.hpp>
6+
7+
#if defined(BOOST_GCC) && BOOST_GCC < 50000
8+
# define BOOST_ALLOW_DEPRECATED
9+
#endif
10+
511
#include <boost/variant2/variant.hpp>
612
#include <boost/json/value_from.hpp>
713
#include <boost/json/serialize.hpp>

‎test/variant_json_value_to.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
// Distributed under the Boost Software License, Version 1.0.
33
// https://www.boost.org/LICENSE_1_0.txt
44

5+
#include <boost/config.hpp>
6+
7+
#if defined(BOOST_GCC) && BOOST_GCC < 50000
8+
# define BOOST_ALLOW_DEPRECATED
9+
#endif
10+
511
#include <boost/variant2/variant.hpp>
612
#include <boost/json/value_to.hpp>
713
#include <boost/json/serialize.hpp>

0 commit comments

Comments
 (0)