Skip to content

Disabling valgrind for now. #3068

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.

Sign up for GitHub

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

Merged
rwgk merged 1 commit into from
Jul 1, 2021
Merged

Disabling valgrind for now. #3068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,10 @@ jobs:
fail-fast: false
matrix:
include:
# valgrind started failing for the final version of PR #3023 (same gcc, python, valgrind as before).
- python-version: 3.9
python-debug: true
valgrind: true
valgrind: false
- python-version: 3.10-dev
python-debug: false

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/ci_sh_def.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,10 @@ jobs:
fail-fast: false
matrix:
include:
# valgrind started failing for the final version of PR #3023 (same gcc, python, valgrind as before).
- python-version: 3.9
python-debug: true
valgrind: true
valgrind: false
- python-version: 3.10-dev
python-debug: false

Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/ci_sh_def.yml.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--- ci.yml 2021-06-24 12:00:18.912375553 -0700
+++ ci_sh_def.yml 2021-06-24 12:01:31.101283417 -0700
--- ci.yml 2021-06-30 17:20:07.213156515 -0700
+++ ci_sh_def.yml 2021-06-30 17:22:01.585076084 -0700
@@ -1,4 +1,16 @@
-name: CI-SH-AVL
+# PLEASE KEEP THIS GROUP OF FILES IN SYNC AT ALL TIMES:
Expand Down Expand Up @@ -34,15 +34,15 @@
${{ matrix.args }}
${{ matrix.args2 }}

@@ -287,6 +301,7 @@
@@ -288,6 +302,7 @@
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")

- name: Build
@@ -316,7 +331,8 @@
@@ -317,7 +332,8 @@
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy

- name: Configure
Expand All @@ -52,7 +52,7 @@

- name: Build
run: cmake --build build -j2 --verbose
@@ -396,7 +412,7 @@
@@ -397,7 +413,7 @@
cmake3 -S . -B build -DDOWNLOAD_CATCH=ON \
-DCMAKE_CXX_STANDARD=11 \
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") \
Expand All @@ -61,63 +61,63 @@
-DPYBIND11_TEST_FILTER="test_smart_ptr.cpp;test_virtual_functions.cpp"

# Building before installing Pip should produce a warning but not an error
@@ -455,6 +471,7 @@
@@ -456,6 +472,7 @@
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")

- name: Build
@@ -510,6 +527,7 @@
@@ -511,6 +528,7 @@
-DDOWNLOAD_CATCH=ON \
-DDOWNLOAD_EIGEN=OFF \
-DCMAKE_CXX_STANDARD=11 \
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
-DCMAKE_CXX_COMPILER=$(which icpc) \
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")

@@ -542,6 +560,7 @@
@@ -543,6 +561,7 @@
-DDOWNLOAD_CATCH=ON \
-DDOWNLOAD_EIGEN=OFF \
-DCMAKE_CXX_STANDARD=17 \
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT" \
-DCMAKE_CXX_COMPILER=$(which icpc) \
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")

@@ -612,6 +631,7 @@
@@ -613,6 +632,7 @@
-DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON
-DCMAKE_CXX_STANDARD=11
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")

- name: Build
@@ -662,6 +682,7 @@
@@ -663,6 +683,7 @@
cmake ../pybind11-tests
-DDOWNLOAD_CATCH=ON
-DPYBIND11_WERROR=ON
+ -DCMAKE_CXX_FLAGS="-DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
working-directory: /build-tests

@@ -757,6 +778,7 @@
@@ -758,6 +779,7 @@
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"
${{ matrix.args }}
- name: Build C++11
run: cmake --build build -j 2
@@ -803,6 +825,7 @@
@@ -804,6 +826,7 @@
-DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=OFF
-DDOWNLOAD_EIGEN=ON
+ -DCMAKE_CXX_FLAGS="/GR /EHsc /DPYBIND11_USE_SMART_HOLDER_AS_DEFAULT"

- name: Build C++14
run: cmake --build build -j 2
@@ -823,12 +846,13 @@
@@ -824,12 +847,13 @@
- 3.7
std:
- 14
Expand Down