From 7ddf1371f87c1e8b8f54d9dbdffbfa8a8fc89274 Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Mon, 6 Jan 2025 13:59:40 -0500 Subject: [PATCH 1/2] Re-activate MSVC 14.3 and Clang-CL testing --- .github/workflows/ci.yml | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a079dac63..c31348ff4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -467,28 +467,26 @@ jobs: cxxstd: "14,17,20,latest" addrmd: "32" os: windows-2019 - # B2 does not work with MSVC 17.10. Once it's updated we can re-enable these tests - # Still covered in drone - #- toolset: msvc-14.3 - # cxxstd: "14,17,20,latest" - # addrmd: "32" - # os: windows-2022 + - toolset: msvc-14.3 + cxxstd: "14,17,20,latest" + addrmd: "32" + os: windows-2022 - toolset: msvc-14.2 cxxstd: "14,17,20,latest" addrmd: "64" os: windows-2019 - #- toolset: msvc-14.3 - # cxxstd: "14,17,20,latest" - # addrmd: "64" - # os: windows-2022 - #- toolset: clang-win - # cxxstd: "14,17,latest" - # addrmd: "32" - # os: windows-2022 - #- toolset: clang-win - # cxxstd: "14,17,latest" - # addrmd: "64" - # os: windows-2022 + - toolset: msvc-14.3 + cxxstd: "14,17,20,latest" + addrmd: "64" + os: windows-2022 + - toolset: clang-win + cxxstd: "14,17,latest" + addrmd: "32" + os: windows-2022 + - toolset: clang-win + cxxstd: "14,17,latest" + addrmd: "64" + os: windows-2022 - toolset: gcc cxxstd: "03,11,14,17,2a" addrmd: "64" From d800d97e7452ffc374b34b622d7517e05508b83d Mon Sep 17 00:00:00 2001 From: Matt Borland Date: Mon, 6 Jan 2025 14:15:17 -0500 Subject: [PATCH 2/2] Add additional intel language standards --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c31348ff4..759722275 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -743,7 +743,7 @@ jobs: fail-fast: false matrix: compiler: [ intel ] - standard: [ c++20 ] + standard: [ 14, 17, 20, 23 ] steps: - uses: actions/checkout@v4 with: @@ -791,7 +791,12 @@ jobs: run: | cd ../boost-root mkdir __build__ && cd __build__ - cmake -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DBOOST_INCLUDE_LIBRARIES=$LIBRARY -DBUILD_TESTING=ON .. + cmake -DCMAKE_C_COMPILER=icx \ + -DCMAKE_CXX_COMPILER=icpx \ + -DCMAKE_CXX_STANDARD=${{ matrix.standard }} \ + -DCMAKE_CXX_STANDARD_REQUIRED=ON \ + -DBOOST_INCLUDE_LIBRARIES=$LIBRARY \ + -DBUILD_TESTING=ON .. - name: Build tests run: |