Tracking ci.yml changes from master.

This commit is contained in:
Ralf W. Grosse-Kunstleve 2022-01-26 09:59:04 -08:00
parent ece3c55e88
commit b2f0b091c9
2 changed files with 12 additions and 13 deletions

View File

@ -930,8 +930,7 @@ jobs:
- { sys: mingw64, env: x86_64 } - { sys: mingw64, env: x86_64 }
- { sys: mingw32, env: i686 } - { sys: mingw32, env: i686 }
steps: steps:
# Force version because of https://github.com/msys2/setup-msys2/issues/167 - uses: msys2/setup-msys2@v2
- uses: msys2/setup-msys2@v2.4.2
with: with:
msystem: ${{matrix.sys}} msystem: ${{matrix.sys}}
install: >- install: >-
@ -961,10 +960,10 @@ jobs:
run: cmake --build build --target pytest -j 2 run: cmake --build build --target pytest -j 2
- name: C++11 tests - name: C++11 tests
run: cmake --build build --target cpptest -j 2 run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build --target cpptest -j 2
- name: Interface test C++11 - name: Interface test C++11
run: cmake --build build --target test_cmake_build run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build --target test_cmake_build
- name: Clean directory - name: Clean directory
run: git clean -fdx run: git clean -fdx
@ -979,10 +978,10 @@ jobs:
run: cmake --build build2 --target pytest -j 2 run: cmake --build build2 --target pytest -j 2
- name: C++14 tests - name: C++14 tests
run: cmake --build build2 --target cpptest -j 2 run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build2 --target cpptest -j 2
- name: Interface test C++14 - name: Interface test C++14
run: cmake --build build2 --target test_cmake_build run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build2 --target test_cmake_build
- name: Clean directory - name: Clean directory
run: git clean -fdx run: git clean -fdx
@ -997,7 +996,7 @@ jobs:
run: cmake --build build3 --target pytest -j 2 run: cmake --build build3 --target pytest -j 2
- name: C++17 tests - name: C++17 tests
run: cmake --build build3 --target cpptest -j 2 run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build3 --target cpptest -j 2
- name: Interface test C++17 - name: Interface test C++17
run: cmake --build build3 --target test_cmake_build run: PYTHONHOME=/${{matrix.sys}} PYTHONPATH=/${{matrix.sys}} cmake --build build3 --target test_cmake_build

View File

@ -1,5 +1,5 @@
--- ci.yml 2022-01-25 16:47:53.830999786 -0800 --- ci.yml 2022-01-26 09:58:21.687199720 -0800
+++ ci_sh_def.yml 2022-01-25 16:48:45.714550945 -0800 +++ ci_sh_def.yml 2022-01-26 09:58:52.261291935 -0800
@@ -1,4 +1,16 @@ @@ -1,4 +1,16 @@
-name: CI -name: CI
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES: +# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@ -156,7 +156,7 @@
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
@@ -927,7 +952,7 @@ @@ -926,7 +951,7 @@
- name: Configure C++11 - name: Configure C++11
# LTO leads to many undefined reference like # LTO leads to many undefined reference like
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&) # `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
@ -165,7 +165,7 @@
- name: Build C++11 - name: Build C++11
run: cmake --build build -j 2 run: cmake --build build -j 2
@@ -945,7 +970,7 @@ @@ -944,7 +969,7 @@
run: git clean -fdx run: git clean -fdx
- name: Configure C++14 - name: Configure C++14
@ -174,7 +174,7 @@
- name: Build C++14 - name: Build C++14
run: cmake --build build2 -j 2 run: cmake --build build2 -j 2
@@ -963,7 +988,7 @@ @@ -962,7 +987,7 @@
run: git clean -fdx run: git clean -fdx
- name: Configure C++17 - name: Configure C++17