Skip to content

Commit b3d9c35

Browse files
rwgkhenryiii
andauthored
vi: replacing currently broken ICC Latest C++17 with C++14. (#3551)
* Trivial change. * Trying ICC Latest C++14 instead of C++17. * Trying ICC Latest C++20 instead of C++17. * Settling on ICC Latest C++14 for now. * Undoing trivial change. * ci: try using SETUPTOOLS_USE_DISTUTILS=stdlib Co-authored-by: Henry Schreiner <[email protected]>
1 parent d0406c7 commit b3d9c35

File tree

1 file changed

+13
-11
lines changed

1 file changed

+13
-11
lines changed

.github/workflows/ci.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,8 @@ jobs:
247247
python -m pip install -r tests/requirements.txt
248248
249249
- name: Configure
250+
env:
251+
SETUPTOOLS_USE_DISTUTILS: stdlib
250252
run: >
251253
cmake -S . -B build
252254
-DCMAKE_BUILD_TYPE=Debug
@@ -555,37 +557,37 @@ jobs:
555557
set +e; source /opt/intel/oneapi/setvars.sh; set -e
556558
cmake --build build-11 --target test_cmake_build
557559
558-
- name: Configure C++17
560+
- name: Configure C++14
559561
run: |
560562
set +e; source /opt/intel/oneapi/setvars.sh; set -e
561-
cmake -S . -B build-17 \
563+
cmake -S . -B build-14 \
562564
-DPYBIND11_WERROR=ON \
563565
-DDOWNLOAD_CATCH=ON \
564566
-DDOWNLOAD_EIGEN=OFF \
565-
-DCMAKE_CXX_STANDARD=17 \
567+
-DCMAKE_CXX_STANDARD=14 \
566568
-DCMAKE_CXX_COMPILER=$(which icpc) \
567569
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
568570
569-
- name: Build C++17
571+
- name: Build C++14
570572
run: |
571573
set +e; source /opt/intel/oneapi/setvars.sh; set -e
572-
cmake --build build-17 -j 2 -v
574+
cmake --build build-14 -j 2 -v
573575
574-
- name: Python tests C++17
576+
- name: Python tests C++14
575577
run: |
576578
set +e; source /opt/intel/oneapi/setvars.sh; set -e
577579
sudo service apport stop
578-
cmake --build build-17 --target check
580+
cmake --build build-14 --target check
579581
580-
- name: C++ tests C++17
582+
- name: C++ tests C++14
581583
run: |
582584
set +e; source /opt/intel/oneapi/setvars.sh; set -e
583-
cmake --build build-17 --target cpptest
585+
cmake --build build-14 --target cpptest
584586
585-
- name: Interface test C++17
587+
- name: Interface test C++14
586588
run: |
587589
set +e; source /opt/intel/oneapi/setvars.sh; set -e
588-
cmake --build build-17 --target test_cmake_build
590+
cmake --build build-14 --target test_cmake_build
589591
590592
591593
# Testing on CentOS (manylinux uses a centos base, and this is an easy way

0 commit comments

Comments
 (0)