mirror of
https://github.com/pybind/pybind11.git
synced 2024-11-26 23:22:01 +00:00
Merge branch 'pybind:master' into master
This commit is contained in:
commit
27ea9028fe
6
.github/workflows/ci.yml
vendored
6
.github/workflows/ci.yml
vendored
@ -180,7 +180,9 @@ jobs:
|
|||||||
# This makes sure the setup_helpers module can build packages using
|
# This makes sure the setup_helpers module can build packages using
|
||||||
# setuptools
|
# setuptools
|
||||||
- name: Setuptools helpers test
|
- name: Setuptools helpers test
|
||||||
run: pytest tests/extra_setuptools
|
run: |
|
||||||
|
pip install setuptools
|
||||||
|
pytest tests/extra_setuptools
|
||||||
if: "!(matrix.runs-on == 'windows-2022')"
|
if: "!(matrix.runs-on == 'windows-2022')"
|
||||||
|
|
||||||
|
|
||||||
@ -242,8 +244,6 @@ jobs:
|
|||||||
python -m pip install -r tests/requirements.txt
|
python -m pip install -r tests/requirements.txt
|
||||||
|
|
||||||
- name: Configure
|
- name: Configure
|
||||||
env:
|
|
||||||
SETUPTOOLS_USE_DISTUTILS: stdlib
|
|
||||||
run: >
|
run: >
|
||||||
cmake -S . -B build
|
cmake -S . -B build
|
||||||
-DCMAKE_BUILD_TYPE=Debug
|
-DCMAKE_BUILD_TYPE=Debug
|
||||||
|
19
.github/workflows/upstream.yml
vendored
19
.github/workflows/upstream.yml
vendored
@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
name: Upstream
|
name: Upstream
|
||||||
|
|
||||||
on:
|
on:
|
||||||
@ -65,8 +64,8 @@ jobs:
|
|||||||
- name: Python tests C++11
|
- name: Python tests C++11
|
||||||
run: cmake --build build11 --target pytest -j 2
|
run: cmake --build build11 --target pytest -j 2
|
||||||
|
|
||||||
# - name: C++11 tests
|
- name: C++11 tests
|
||||||
# run: cmake --build build11 --target cpptest -j 2
|
run: cmake --build build11 --target cpptest -j 2
|
||||||
|
|
||||||
- name: Interface test C++11
|
- name: Interface test C++11
|
||||||
run: cmake --build build11 --target test_cmake_build
|
run: cmake --build build11 --target test_cmake_build
|
||||||
@ -80,14 +79,14 @@ jobs:
|
|||||||
-DDOWNLOAD_EIGEN=ON
|
-DDOWNLOAD_EIGEN=ON
|
||||||
-DCMAKE_CXX_STANDARD=17
|
-DCMAKE_CXX_STANDARD=17
|
||||||
|
|
||||||
- name: Build
|
- name: Build C++17
|
||||||
run: cmake --build build17 -j 2
|
run: cmake --build build17 -j 2
|
||||||
|
|
||||||
- name: Python tests
|
- name: Python tests C++17
|
||||||
run: cmake --build build17 --target pytest
|
run: cmake --build build17 --target pytest
|
||||||
|
|
||||||
# - name: C++ tests
|
- name: C++17 tests
|
||||||
# run: cmake --build build17 --target cpptest
|
run: cmake --build build17 --target cpptest
|
||||||
|
|
||||||
# Third build - C++17 mode with unstable ABI
|
# Third build - C++17 mode with unstable ABI
|
||||||
- name: Configure (unstable ABI)
|
- name: Configure (unstable ABI)
|
||||||
@ -105,10 +104,12 @@ jobs:
|
|||||||
- name: Python tests (unstable ABI)
|
- name: Python tests (unstable ABI)
|
||||||
run: cmake --build build17max --target pytest
|
run: cmake --build build17max --target pytest
|
||||||
|
|
||||||
- name: Interface test
|
- name: Interface test (unstable ABI)
|
||||||
run: cmake --build build17max --target test_cmake_build
|
run: cmake --build build17max --target test_cmake_build
|
||||||
|
|
||||||
# This makes sure the setup_helpers module can build packages using
|
# This makes sure the setup_helpers module can build packages using
|
||||||
# setuptools
|
# setuptools
|
||||||
- name: Setuptools helpers test
|
- name: Setuptools helpers test
|
||||||
run: pytest tests/extra_setuptools
|
run: |
|
||||||
|
pip install setuptools
|
||||||
|
pytest tests/extra_setuptools
|
||||||
|
Loading…
Reference in New Issue
Block a user