Skip to content

Commit d470174

Browse files
authored
Merge pull request #775 from cppalliance/win
Re-activate MSVC 14.3 and Clang-CL testing and Improve Intel Testing
2 parents d70e67f + d800d97 commit d470174

File tree

1 file changed

+23
-20
lines changed

1 file changed

+23
-20
lines changed

.github/workflows/ci.yml

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -467,28 +467,26 @@ jobs:
467467
cxxstd: "14,17,20,latest"
468468
addrmd: "32"
469469
os: windows-2019
470-
# B2 does not work with MSVC 17.10. Once it's updated we can re-enable these tests
471-
# Still covered in drone
472-
#- toolset: msvc-14.3
473-
# cxxstd: "14,17,20,latest"
474-
# addrmd: "32"
475-
# os: windows-2022
470+
- toolset: msvc-14.3
471+
cxxstd: "14,17,20,latest"
472+
addrmd: "32"
473+
os: windows-2022
476474
- toolset: msvc-14.2
477475
cxxstd: "14,17,20,latest"
478476
addrmd: "64"
479477
os: windows-2019
480-
#- toolset: msvc-14.3
481-
# cxxstd: "14,17,20,latest"
482-
# addrmd: "64"
483-
# os: windows-2022
484-
#- toolset: clang-win
485-
# cxxstd: "14,17,latest"
486-
# addrmd: "32"
487-
# os: windows-2022
488-
#- toolset: clang-win
489-
# cxxstd: "14,17,latest"
490-
# addrmd: "64"
491-
# os: windows-2022
478+
- toolset: msvc-14.3
479+
cxxstd: "14,17,20,latest"
480+
addrmd: "64"
481+
os: windows-2022
482+
- toolset: clang-win
483+
cxxstd: "14,17,latest"
484+
addrmd: "32"
485+
os: windows-2022
486+
- toolset: clang-win
487+
cxxstd: "14,17,latest"
488+
addrmd: "64"
489+
os: windows-2022
492490
- toolset: gcc
493491
cxxstd: "03,11,14,17,2a"
494492
addrmd: "64"
@@ -745,7 +743,7 @@ jobs:
745743
fail-fast: false
746744
matrix:
747745
compiler: [ intel ]
748-
standard: [ c++20 ]
746+
standard: [ 14, 17, 20, 23 ]
749747
steps:
750748
- uses: actions/checkout@v4
751749
with:
@@ -793,7 +791,12 @@ jobs:
793791
run: |
794792
cd ../boost-root
795793
mkdir __build__ && cd __build__
796-
cmake -DCMAKE_C_COMPILER=icx -DCMAKE_CXX_COMPILER=icpx -DBOOST_INCLUDE_LIBRARIES=$LIBRARY -DBUILD_TESTING=ON ..
794+
cmake -DCMAKE_C_COMPILER=icx \
795+
-DCMAKE_CXX_COMPILER=icpx \
796+
-DCMAKE_CXX_STANDARD=${{ matrix.standard }} \
797+
-DCMAKE_CXX_STANDARD_REQUIRED=ON \
798+
-DBOOST_INCLUDE_LIBRARIES=$LIBRARY \
799+
-DBUILD_TESTING=ON ..
797800
798801
- name: Build tests
799802
run: |

0 commit comments

Comments
 (0)