upgraded CI (#31)

This commit is contained in:
joaquintides
2025-06-21 18:14:40 +02:00
committed by GitHub
parent a0a734cab8
commit 1ae6a823b9
2 changed files with 25 additions and 19 deletions
+20 -17
View File
@@ -38,17 +38,20 @@ jobs:
address-model: 32,64 address-model: 32,64
- toolset: gcc-7 - toolset: gcc-7
cxxstd: "11,14,17" cxxstd: "11,14,17"
os: ubuntu-20.04 container: ubuntu:20.04
os: ubuntu-latest
install: g++-7-multilib install: g++-7-multilib
address-model: 32,64 address-model: 32,64
- toolset: gcc-8 - toolset: gcc-8
cxxstd: "11,14,17,2a" cxxstd: "11,14,17,2a"
os: ubuntu-20.04 container: ubuntu:20.04
os: ubuntu-latest
install: g++-8-multilib install: g++-8-multilib
address-model: 32,64 address-model: 32,64
- toolset: gcc-9 - toolset: gcc-9
cxxstd: "11,14,17,2a" cxxstd: "11,14,17,2a"
os: ubuntu-20.04 container: ubuntu:20.04
os: ubuntu-latest
install: g++-9-multilib install: g++-9-multilib
address-model: 32,64 address-model: 32,64
- toolset: gcc-10 - toolset: gcc-10
@@ -109,25 +112,33 @@ jobs:
- toolset: clang - toolset: clang
compiler: clang++-8 compiler: clang++-8
cxxstd: "11,14,17" cxxstd: "11,14,17"
os: ubuntu-20.04 container: ubuntu:20.04
os: ubuntu-latest
install: clang-8 install: clang-8
- toolset: clang - toolset: clang
compiler: clang++-9 compiler: clang++-9
cxxstd: "11,14,17,2a" cxxstd: "11,14,17,2a"
os: ubuntu-20.04 container: ubuntu:20.04
os: ubuntu-latest
install: clang-9 install: clang-9
- toolset: clang - toolset: clang
compiler: clang++-10 compiler: clang++-10
cxxstd: "11,14,17,2a" cxxstd: "11,14,17,2a"
os: ubuntu-20.04 container: ubuntu:20.04
os: ubuntu-latest
install: clang-10
- toolset: clang - toolset: clang
compiler: clang++-11 compiler: clang++-11
cxxstd: "11,14,17,2a" cxxstd: "11,14,17,2a"
os: ubuntu-20.04 container: ubuntu:20.04
os: ubuntu-latest
install: clang-11
- toolset: clang - toolset: clang
compiler: clang++-12 compiler: clang++-12
cxxstd: "11,14,17,20" cxxstd: "11,14,17,20"
os: ubuntu-20.04 container: ubuntu:20.04
os: ubuntu-latest
install: clang-12
- toolset: clang - toolset: clang
compiler: clang++-13 compiler: clang++-13
cxxstd: "11,14,17,20,2b" cxxstd: "11,14,17,20,2b"
@@ -239,14 +250,6 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
include: include:
- toolset: msvc-14.0
cxxstd: 14,latest
addrmd: 32,64
os: windows-2019
- toolset: msvc-14.2
cxxstd: "14,17,20,latest"
addrmd: 32,64
os: windows-2019
- toolset: msvc-14.3 - toolset: msvc-14.3
cxxstd: "14,17,20,latest" cxxstd: "14,17,20,latest"
addrmd: 32,64 addrmd: 32,64
@@ -258,7 +261,7 @@ jobs:
- toolset: gcc - toolset: gcc
cxxstd: "11,14,17,2a" cxxstd: "11,14,17,2a"
addrmd: 64 addrmd: 64
os: windows-2019 os: windows-2022
runs-on: ${{matrix.os}} runs-on: ${{matrix.os}}
+5 -2
View File
@@ -11,7 +11,7 @@ branches:
only: only:
- master - master
- develop - develop
environment: environment:
matrix: matrix:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
@@ -19,6 +19,9 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
TOOLSET: msvc-14.1 TOOLSET: msvc-14.1
CXXSTD: 14,17 CXXSTD: 14,17
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
TOOLSET: msvc-14.2
CXXSTD: 14,17,20,latest
install: install:
- cd .. - cd ..
@@ -34,4 +37,4 @@ build: off
test_script: test_script:
- if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD% - if not "%CXXSTD%" == "" set CXXSTD=cxxstd=%CXXSTD%
- b2 libs/poly_collection/test toolset=%TOOLSET% %CXXSTD% - b2 libs/poly_collection/test toolset=%TOOLSET% %CXXSTD%