Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

git merge smart_holder #30146

Merged
merged 5 commits into from
Aug 14, 2024
Merged

git merge smart_holder #30146

merged 5 commits into from
Aug 14, 2024

Conversation

rwgk
Copy link
Contributor

@rwgk rwgk commented Aug 14, 2024

Description

Helper/scratch PR for testing.

Suggested changelog entry:

Ralf W. Grosse-Kunstleve and others added 5 commits August 13, 2024 20:08
…sts with `-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT` (google#5307)

* Configure only one job per OS kind to build and run tests with `-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT`

Remove ci_sh_def.yml

Piggy-backed: Add `smart_holder` to `branches` in emscripten.yaml

* Fix misunderstanding.

* Add `/GR /EHsc` for Windows.

* #error "Intentional Breakage" (to verify: PYBIND11_ACTUALLY_USING_SMART_HOLDER_AS_DEFAULT)

* Revert "#error "Intentional Breakage" (to verify: PYBIND11_ACTUALLY_USING_SMART_HOLDER_AS_DEFAULT)"

This reverts commit 4f6f5cb6e907ab2352733c4756bf68662e9c3f01.
Copy link

google-cla bot commented Aug 14, 2024

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@rwgk rwgk marked this pull request as ready for review August 14, 2024 14:52
@rwgk rwgk merged commit 77bb65c into google:main Aug 14, 2024
73 checks passed
@rwgk rwgk deleted the pybind11k_merge_sh branch August 14, 2024 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants