mirror of
https://github.com/boostorg/multi_index.git
synced 2025-05-11 05:14:05 +00:00
Merge branch 'develop'
This commit is contained in:
commit
1e952cd5a7
@ -6,7 +6,7 @@ local library = "multi_index";
|
|||||||
|
|
||||||
local triggers =
|
local triggers =
|
||||||
{
|
{
|
||||||
branch: [ "master", "develop", "feature/*" ]
|
branch: [ "master", "develop", "feature/*", "fix/*" ]
|
||||||
};
|
};
|
||||||
|
|
||||||
local ubsan = { UBSAN: '1', UBSAN_OPTIONS: 'print_stacktrace=1' };
|
local ubsan = { UBSAN: '1', UBSAN_OPTIONS: 'print_stacktrace=1' };
|
||||||
@ -192,42 +192,42 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
|
|||||||
|
|
||||||
linux_pipeline(
|
linux_pipeline(
|
||||||
"Linux 23.04 GCC 13 32/64 UBSAN C++11-14",
|
"Linux 23.04 GCC 13 32/64 UBSAN C++11-14",
|
||||||
"cppalliance/droneubuntu2304:1",
|
"cppalliance/droneubuntu2404:1",
|
||||||
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14', ADDRMD: '32,64' } + ubsan,
|
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14', ADDRMD: '32,64' } + ubsan,
|
||||||
"g++-13-multilib",
|
"g++-13-multilib",
|
||||||
),
|
),
|
||||||
|
|
||||||
linux_pipeline(
|
linux_pipeline(
|
||||||
"Linux 23.04 GCC 13 32/64 UBSAN C++17-20",
|
"Linux 23.04 GCC 13 32/64 UBSAN C++17-20",
|
||||||
"cppalliance/droneubuntu2304:1",
|
"cppalliance/droneubuntu2404:1",
|
||||||
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '17,20', ADDRMD: '32,64' } + ubsan,
|
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '17,20', ADDRMD: '32,64' } + ubsan,
|
||||||
"g++-13-multilib",
|
"g++-13-multilib",
|
||||||
),
|
),
|
||||||
|
|
||||||
linux_pipeline(
|
linux_pipeline(
|
||||||
"Linux 23.04 GCC 13 32/64 UBSAN",
|
"Linux 23.04 GCC 13 32/64 UBSAN",
|
||||||
"cppalliance/droneubuntu2304:1",
|
"cppalliance/droneubuntu2404:1",
|
||||||
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '2b', ADDRMD: '32,64' } + ubsan,
|
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '2b', ADDRMD: '32,64' } + ubsan,
|
||||||
"g++-13-multilib",
|
"g++-13-multilib",
|
||||||
),
|
),
|
||||||
|
|
||||||
linux_pipeline(
|
linux_pipeline(
|
||||||
"Linux 23.04 GCC 13 32 ASAN C++11-14",
|
"Linux 23.04 GCC 13 32 ASAN C++11-14",
|
||||||
"cppalliance/droneubuntu2304:1",
|
"cppalliance/droneubuntu2404:1",
|
||||||
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14', ADDRMD: '32' } + asan,
|
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '11,14', ADDRMD: '32' } + asan,
|
||||||
"g++-13-multilib",
|
"g++-13-multilib",
|
||||||
),
|
),
|
||||||
|
|
||||||
linux_pipeline(
|
linux_pipeline(
|
||||||
"Linux 23.04 GCC 13 32 ASAN C++17-20",
|
"Linux 23.04 GCC 13 32 ASAN C++17-20",
|
||||||
"cppalliance/droneubuntu2304:1",
|
"cppalliance/droneubuntu2404:1",
|
||||||
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '17,20', ADDRMD: '32' } + asan,
|
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '17,20', ADDRMD: '32' } + asan,
|
||||||
"g++-13-multilib",
|
"g++-13-multilib",
|
||||||
),
|
),
|
||||||
|
|
||||||
linux_pipeline(
|
linux_pipeline(
|
||||||
"Linux 23.04 GCC 13 32 ASAN",
|
"Linux 23.04 GCC 13 32 ASAN",
|
||||||
"cppalliance/droneubuntu2304:1",
|
"cppalliance/droneubuntu2404:1",
|
||||||
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '2b', ADDRMD: '32' } + asan,
|
{ TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '2b', ADDRMD: '32' } + asan,
|
||||||
"g++-13-multilib",
|
"g++-13-multilib",
|
||||||
),
|
),
|
||||||
@ -395,21 +395,21 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
|
|||||||
|
|
||||||
linux_pipeline(
|
linux_pipeline(
|
||||||
"Linux 23.04 Clang 16",
|
"Linux 23.04 Clang 16",
|
||||||
"cppalliance/droneubuntu2304:1",
|
"cppalliance/droneubuntu2404:1",
|
||||||
{ TOOLSET: 'clang', COMPILER: 'clang++-16', CXXSTD: '11,14,17,20,2b' },
|
{ TOOLSET: 'clang', COMPILER: 'clang++-16', CXXSTD: '11,14,17,20,2b' },
|
||||||
"clang-16",
|
"clang-16",
|
||||||
),
|
),
|
||||||
|
|
||||||
linux_pipeline(
|
linux_pipeline(
|
||||||
"Linux 23.10 Clang 17 UBSAN",
|
"Linux 23.10 Clang 17 UBSAN",
|
||||||
"cppalliance/droneubuntu2310:1",
|
"cppalliance/droneubuntu2404:1",
|
||||||
{ TOOLSET: 'clang', COMPILER: 'clang++-17', CXXSTD: '11,14,17,20,2b' } + ubsan,
|
{ TOOLSET: 'clang', COMPILER: 'clang++-17', CXXSTD: '11,14,17,20,2b' } + ubsan,
|
||||||
"clang-17",
|
"clang-17",
|
||||||
),
|
),
|
||||||
|
|
||||||
linux_pipeline(
|
linux_pipeline(
|
||||||
"Linux 23.10 Clang 17 ASAN",
|
"Linux 23.10 Clang 17 ASAN",
|
||||||
"cppalliance/droneubuntu2310:1",
|
"cppalliance/droneubuntu2404:1",
|
||||||
{ TOOLSET: 'clang', COMPILER: 'clang++-17', CXXSTD: '11,14,17,20,2b' } + asan,
|
{ TOOLSET: 'clang', COMPILER: 'clang++-17', CXXSTD: '11,14,17,20,2b' } + asan,
|
||||||
"clang-17",
|
"clang-17",
|
||||||
),
|
),
|
||||||
|
23
.github/workflows/ci.yml
vendored
23
.github/workflows/ci.yml
vendored
@ -163,9 +163,6 @@ jobs:
|
|||||||
container: ubuntu:24.04
|
container: ubuntu:24.04
|
||||||
os: ubuntu-latest
|
os: ubuntu-latest
|
||||||
install: clang-18
|
install: clang-18
|
||||||
- toolset: clang
|
|
||||||
cxxstd: "11,14,17,20,2b"
|
|
||||||
os: macos-12
|
|
||||||
- toolset: clang
|
- toolset: clang
|
||||||
cxxstd: "11,14,17,20,2b"
|
cxxstd: "11,14,17,20,2b"
|
||||||
os: macos-13
|
os: macos-13
|
||||||
@ -174,24 +171,28 @@ jobs:
|
|||||||
os: macos-14
|
os: macos-14
|
||||||
|
|
||||||
runs-on: ${{matrix.os}}
|
runs-on: ${{matrix.os}}
|
||||||
container: ${{matrix.container}}
|
container:
|
||||||
|
image: ${{matrix.container}}
|
||||||
|
volumes:
|
||||||
|
- /node20217:/node20217:rw,rshared
|
||||||
|
- ${{ startsWith(matrix.container, 'ubuntu:1') && '/node20217:/__e/node20:ro,rshared' || ' ' }}
|
||||||
|
|
||||||
defaults:
|
defaults:
|
||||||
run:
|
run:
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Enable Node 16
|
|
||||||
run: |
|
|
||||||
echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- uses: actions/checkout@v3
|
|
||||||
|
|
||||||
- name: Setup container environment
|
- name: Setup container environment
|
||||||
if: matrix.container
|
if: matrix.container
|
||||||
run: |
|
run: |
|
||||||
apt-get update
|
apt-get update
|
||||||
apt-get -y install sudo python3 git g++
|
apt-get -y install sudo python3 git g++ curl xz-utils
|
||||||
|
if [[ "${{matrix.container}}" == "ubuntu:1"* ]]; then
|
||||||
|
# Node 20 doesn't work with Ubuntu 16/18 glibc: https://github.com/actions/checkout/issues/1590
|
||||||
|
curl -sL https://archives.boost.io/misc/node/node-v20.9.0-linux-x64-glibc-217.tar.xz | tar -xJ --strip-components 1 -C /node20217
|
||||||
|
fi
|
||||||
|
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Install packages
|
- name: Install packages
|
||||||
if: matrix.install
|
if: matrix.install
|
||||||
|
Loading…
x
Reference in New Issue
Block a user