Skip to content

Commit ece1206

Browse files
authored
ci: set env: VERBOSE: 1 (#4405)
* Revert "Systematically add `-DCMAKE_VERBOSE_MAKEFILE=ON` to obtain full command lines related to `-Wodr` (#4398)" This reverts commit ff42f52. * Set `env: VERBOSE: 1` as suggested by @henryiii * Set `env: VERBOSE: 1` also in all other .yml files using cmake
1 parent 89c3561 commit ece1206

File tree

4 files changed

+15
-19
lines changed

4 files changed

+15
-19
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ env:
1717
PIP_ONLY_BINARY: numpy
1818
FORCE_COLOR: 3
1919
PYTEST_TIMEOUT: 300
20+
# For cmake:
21+
VERBOSE: 1
2022

2123
jobs:
2224
# This is the "main" test suite, which tests a large number of different
@@ -106,7 +108,6 @@ jobs:
106108
- name: Configure C++11 ${{ matrix.args }}
107109
run: >
108110
cmake -S . -B .
109-
-DCMAKE_VERBOSE_MAKEFILE=ON
110111
-DPYBIND11_WERROR=ON
111112
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON
112113
-DDOWNLOAD_CATCH=ON
@@ -136,7 +137,6 @@ jobs:
136137
- name: Configure C++17
137138
run: >
138139
cmake -S . -B build2
139-
-DCMAKE_VERBOSE_MAKEFILE=ON
140140
-DPYBIND11_WERROR=ON
141141
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF
142142
-DDOWNLOAD_CATCH=ON
@@ -159,7 +159,6 @@ jobs:
159159
- name: Configure (unstable ABI)
160160
run: >
161161
cmake -S . -B build3
162-
-DCMAKE_VERBOSE_MAKEFILE=ON
163162
-DPYBIND11_WERROR=ON
164163
-DDOWNLOAD_CATCH=ON
165164
-DDOWNLOAD_EIGEN=ON
@@ -246,7 +245,6 @@ jobs:
246245
SETUPTOOLS_USE_DISTUTILS: stdlib
247246
run: >
248247
cmake -S . -B build
249-
-DCMAKE_VERBOSE_MAKEFILE=ON
250248
-DCMAKE_BUILD_TYPE=Debug
251249
-DPYBIND11_WERROR=ON
252250
-DDOWNLOAD_CATCH=ON
@@ -311,7 +309,6 @@ jobs:
311309
shell: bash
312310
run: >
313311
cmake -S . -B build
314-
-DCMAKE_VERBOSE_MAKEFILE=ON
315312
-DPYBIND11_WERROR=ON
316313
-DDOWNLOAD_CATCH=ON
317314
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
@@ -344,7 +341,7 @@ jobs:
344341
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
345342

346343
- name: Configure
347-
run: cmake -S . -B build -DCMAKE_VERBOSE_MAKEFILE=ON -DPYBIND11_CUDA_TESTS=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
344+
run: cmake -S . -B build -DPYBIND11_CUDA_TESTS=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
348345

349346
- name: Build
350347
run: cmake --build build -j2 --verbose
@@ -382,7 +379,7 @@ jobs:
382379
# run: |
383380
# source /etc/profile.d/modules.sh
384381
# module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/20.11
385-
# cmake -S . -B build -DCMAKE_VERBOSE_MAKEFILE=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=14 -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
382+
# cmake -S . -B build -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=14 -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
386383
#
387384
# - name: Build
388385
# run: cmake --build build -j 2 --verbose
@@ -480,7 +477,6 @@ jobs:
480477
shell: bash
481478
run: >
482479
cmake -S . -B build
483-
-DCMAKE_VERBOSE_MAKEFILE=ON
484480
-DPYBIND11_WERROR=ON
485481
-DDOWNLOAD_CATCH=ON
486482
-DCMAKE_CXX_STANDARD=${{ matrix.std }}
@@ -535,7 +531,6 @@ jobs:
535531
run: |
536532
set +e; source /opt/intel/oneapi/setvars.sh; set -e
537533
cmake -S . -B build-11 \
538-
-DCMAKE_VERBOSE_MAKEFILE=ON \
539534
-DPYBIND11_WERROR=ON \
540535
-DDOWNLOAD_CATCH=ON \
541536
-DDOWNLOAD_EIGEN=OFF \
@@ -568,7 +563,6 @@ jobs:
568563
run: |
569564
set +e; source /opt/intel/oneapi/setvars.sh; set -e
570565
cmake -S . -B build-17 \
571-
-DCMAKE_VERBOSE_MAKEFILE=ON \
572566
-DPYBIND11_WERROR=ON \
573567
-DDOWNLOAD_CATCH=ON \
574568
-DDOWNLOAD_EIGEN=OFF \
@@ -635,7 +629,6 @@ jobs:
635629
shell: bash
636630
run: >
637631
cmake -S . -B build
638-
-DCMAKE_VERBOSE_MAKEFILE=ON
639632
-DCMAKE_BUILD_TYPE=MinSizeRel
640633
-DPYBIND11_WERROR=ON
641634
-DDOWNLOAD_CATCH=ON
@@ -783,7 +776,6 @@ jobs:
783776
run: >
784777
cmake -S . -B build
785778
-G "Visual Studio 16 2019" -A Win32
786-
-DCMAKE_VERBOSE_MAKEFILE=ON
787779
-DPYBIND11_WERROR=ON
788780
-DDOWNLOAD_CATCH=ON
789781
-DDOWNLOAD_EIGEN=ON
@@ -837,7 +829,6 @@ jobs:
837829
run: >
838830
cmake -S . -B build
839831
-G "Visual Studio 16 2019" -A Win32
840-
-DCMAKE_VERBOSE_MAKEFILE=ON
841832
-DCMAKE_BUILD_TYPE=Debug
842833
-DPYBIND11_WERROR=ON
843834
-DDOWNLOAD_CATCH=ON
@@ -878,7 +869,6 @@ jobs:
878869
- name: Configure C++20
879870
run: >
880871
cmake -S . -B build
881-
-DCMAKE_VERBOSE_MAKEFILE=ON
882872
-DPYBIND11_WERROR=ON
883873
-DDOWNLOAD_CATCH=ON
884874
-DDOWNLOAD_EIGEN=ON
@@ -930,7 +920,7 @@ jobs:
930920
- name: Configure C++11
931921
# LTO leads to many undefined reference like
932922
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
933-
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DCMAKE_VERBOSE_MAKEFILE=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build
923+
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build
934924

935925
- name: Build C++11
936926
run: cmake --build build -j 2
@@ -948,7 +938,7 @@ jobs:
948938
run: git clean -fdx
949939

950940
- name: Configure C++14
951-
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DCMAKE_VERBOSE_MAKEFILE=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build2
941+
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build2
952942

953943
- name: Build C++14
954944
run: cmake --build build2 -j 2
@@ -966,7 +956,7 @@ jobs:
966956
run: git clean -fdx
967957

968958
- name: Configure C++17
969-
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DCMAKE_VERBOSE_MAKEFILE=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build3
959+
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build3
970960

971961
- name: Build C++17
972962
run: cmake --build build3 -j 2
@@ -1027,7 +1017,6 @@ jobs:
10271017
- name: Configure Clang
10281018
run: >
10291019
cmake -G Ninja -S . -B .
1030-
-DCMAKE_VERBOSE_MAKEFILE=ON
10311020
-DPYBIND11_WERROR=OFF
10321021
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF
10331022
-DDOWNLOAD_CATCH=ON
@@ -1093,7 +1082,6 @@ jobs:
10931082
- name: CMake Configure
10941083
run: >
10951084
cmake -S . -B .
1096-
-DCMAKE_VERBOSE_MAKEFILE=ON
10971085
-DPYBIND11_WERROR=ON
10981086
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF
10991087
-DDOWNLOAD_CATCH=ON

.github/workflows/configure.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
- stable
1010
- v*
1111

12+
env:
13+
# For cmake:
14+
VERBOSE: 1
15+
1216
jobs:
1317
# This tests various versions of CMake in various combinations, to make sure
1418
# the configure step passes.

.github/workflows/format.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ on:
1414

1515
env:
1616
FORCE_COLOR: 3
17+
# For cmake:
18+
VERBOSE: 1
1719

1820
jobs:
1921
pre-commit:

.github/workflows/upstream.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ concurrency:
1111

1212
env:
1313
PIP_ONLY_BINARY: numpy
14+
# For cmake:
15+
VERBOSE: 1
1416

1517
jobs:
1618
standard:

0 commit comments

Comments
 (0)