pybind/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2026-05-12 17:26:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into sh_merge_master

Browse Source
This commit is contained in:
Ralf W. Grosse-Kunstleve
2021-07-30 11:37:51 -07:00
parent 663dfb28af dcbda8d7ff
commit aff3cf7b65
18 changed files with 198 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
.github/workflows/ci.yml vendored
View File

@@ -860,3 +860,34 @@ jobs:
- name: Run all checks
run: cmake --build build -t check
mingw:
runs-on: windows-latest
defaults:
run:
shell: msys2 {0}
steps:
- uses: msys2/setup-msys2@v2
with:
install: >-
mingw-w64-x86_64-gcc
mingw-w64-x86_64-python-pip
mingw-w64-x86_64-cmake
mingw-w64-x86_64-make
mingw-w64-x86_64-python-pytest
mingw-w64-x86_64-eigen3
mingw-w64-x86_64-boost
mingw-w64-x86_64-catch
- uses: actions/checkout@v1
- name: Configure
# LTO leads to many undefined reference like
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
run: cmake -G "MinGW Makefiles" -S . -B build
- name: Build
run: cmake --build build -j 2
- name: Python tests
run: cmake --build build --target pytest

31
.github/workflows/ci_sh_def.yml vendored
View File

@@ -884,3 +884,34 @@ jobs:
- name: Run all checks
run: cmake --build build -t check
mingw:
runs-on: windows-latest
defaults:
run:
shell: msys2 {0}
steps:
- uses: msys2/setup-msys2@v2
with:
install: >-
mingw-w64-x86_64-gcc
mingw-w64-x86_64-python-pip
mingw-w64-x86_64-cmake
mingw-w64-x86_64-make
mingw-w64-x86_64-python-pytest
mingw-w64-x86_64-eigen3
mingw-w64-x86_64-boost
mingw-w64-x86_64-catch
- uses: actions/checkout@v1
- name: Configure
# LTO leads to many undefined reference like
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
run: cmake -G "MinGW Makefiles" -S . -B build -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
- name: Build
run: cmake --build build -j 2
- name: Python tests
run: cmake --build build --target pytest

13
.github/workflows/ci_sh_def.yml.patch vendored
View File

@@ -1,5 +1,5 @@
--- ci.yml 2021-07-11 00:44:59.934547958 -0700
+++ ci_sh_def.yml 2021-07-11 00:45:29.964628911 -0700
--- ci.yml 2021-07-30 11:29:33.606510028 -0700
+++ ci_sh_def.yml 2021-07-30 11:36:51.284724775 -0700
@@ -1,4 +1,16 @@
-name: CI-SH-AVL
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
@@ -132,3 +132,12 @@
steps:
- uses: actions/checkout@v2
@@ -884,7 +908,7 @@
- name: Configure
# LTO leads to many undefined reference like
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
- run: cmake -G "MinGW Makefiles" -S . -B build
+ run: cmake -G "MinGW Makefiles" -S . -B build -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
- name: Build
run: cmake --build build -j 2