Commit ece1206b by Ralf W. Grosse-Kunstleve Committed by GitHub

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 ff42f525.

* Set `env: VERBOSE: 1` as suggested by @henryiii

* Set `env: VERBOSE: 1` also in all other .yml files using cmake
parent 89c3561d
...@@ -17,6 +17,8 @@ env: ...@@ -17,6 +17,8 @@ env:
PIP_ONLY_BINARY: numpy PIP_ONLY_BINARY: numpy
FORCE_COLOR: 3 FORCE_COLOR: 3
PYTEST_TIMEOUT: 300 PYTEST_TIMEOUT: 300
# For cmake:
VERBOSE: 1
jobs: jobs:
# This is the "main" test suite, which tests a large number of different # This is the "main" test suite, which tests a large number of different
...@@ -106,7 +108,6 @@ jobs: ...@@ -106,7 +108,6 @@ jobs:
- name: Configure C++11 ${{ matrix.args }} - name: Configure C++11 ${{ matrix.args }}
run: > run: >
cmake -S . -B . cmake -S . -B .
-DCMAKE_VERBOSE_MAKEFILE=ON
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON -DPYBIND11_SIMPLE_GIL_MANAGEMENT=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
...@@ -136,7 +137,6 @@ jobs: ...@@ -136,7 +137,6 @@ jobs:
- name: Configure C++17 - name: Configure C++17
run: > run: >
cmake -S . -B build2 cmake -S . -B build2
-DCMAKE_VERBOSE_MAKEFILE=ON
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF -DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
...@@ -159,7 +159,6 @@ jobs: ...@@ -159,7 +159,6 @@ jobs:
- name: Configure (unstable ABI) - name: Configure (unstable ABI)
run: > run: >
cmake -S . -B build3 cmake -S . -B build3
-DCMAKE_VERBOSE_MAKEFILE=ON
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
...@@ -246,7 +245,6 @@ jobs: ...@@ -246,7 +245,6 @@ jobs:
SETUPTOOLS_USE_DISTUTILS: stdlib SETUPTOOLS_USE_DISTUTILS: stdlib
run: > run: >
cmake -S . -B build cmake -S . -B build
-DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
...@@ -311,7 +309,6 @@ jobs: ...@@ -311,7 +309,6 @@ jobs:
shell: bash shell: bash
run: > run: >
cmake -S . -B build cmake -S . -B build
-DCMAKE_VERBOSE_MAKEFILE=ON
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }} -DCMAKE_CXX_STANDARD=${{ matrix.std }}
...@@ -344,7 +341,7 @@ jobs: ...@@ -344,7 +341,7 @@ jobs:
run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy run: apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y cmake git python3-dev python3-pytest python3-numpy
- name: Configure - name: Configure
run: cmake -S . -B build -DCMAKE_VERBOSE_MAKEFILE=ON -DPYBIND11_CUDA_TESTS=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON run: cmake -S . -B build -DPYBIND11_CUDA_TESTS=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON
- name: Build - name: Build
run: cmake --build build -j2 --verbose run: cmake --build build -j2 --verbose
...@@ -382,7 +379,7 @@ jobs: ...@@ -382,7 +379,7 @@ jobs:
# run: | # run: |
# source /etc/profile.d/modules.sh # source /etc/profile.d/modules.sh
# module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/20.11 # module load /opt/nvidia/hpc_sdk/modulefiles/nvhpc/20.11
# cmake -S . -B build -DCMAKE_VERBOSE_MAKEFILE=ON -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=14 -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)") # cmake -S . -B build -DDOWNLOAD_CATCH=ON -DCMAKE_CXX_STANDARD=14 -DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
# #
# - name: Build # - name: Build
# run: cmake --build build -j 2 --verbose # run: cmake --build build -j 2 --verbose
...@@ -480,7 +477,6 @@ jobs: ...@@ -480,7 +477,6 @@ jobs:
shell: bash shell: bash
run: > run: >
cmake -S . -B build cmake -S . -B build
-DCMAKE_VERBOSE_MAKEFILE=ON
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DCMAKE_CXX_STANDARD=${{ matrix.std }} -DCMAKE_CXX_STANDARD=${{ matrix.std }}
...@@ -535,7 +531,6 @@ jobs: ...@@ -535,7 +531,6 @@ jobs:
run: | run: |
set +e; source /opt/intel/oneapi/setvars.sh; set -e set +e; source /opt/intel/oneapi/setvars.sh; set -e
cmake -S . -B build-11 \ cmake -S . -B build-11 \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DPYBIND11_WERROR=ON \ -DPYBIND11_WERROR=ON \
-DDOWNLOAD_CATCH=ON \ -DDOWNLOAD_CATCH=ON \
-DDOWNLOAD_EIGEN=OFF \ -DDOWNLOAD_EIGEN=OFF \
...@@ -568,7 +563,6 @@ jobs: ...@@ -568,7 +563,6 @@ jobs:
run: | run: |
set +e; source /opt/intel/oneapi/setvars.sh; set -e set +e; source /opt/intel/oneapi/setvars.sh; set -e
cmake -S . -B build-17 \ cmake -S . -B build-17 \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DPYBIND11_WERROR=ON \ -DPYBIND11_WERROR=ON \
-DDOWNLOAD_CATCH=ON \ -DDOWNLOAD_CATCH=ON \
-DDOWNLOAD_EIGEN=OFF \ -DDOWNLOAD_EIGEN=OFF \
...@@ -635,7 +629,6 @@ jobs: ...@@ -635,7 +629,6 @@ jobs:
shell: bash shell: bash
run: > run: >
cmake -S . -B build cmake -S . -B build
-DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_BUILD_TYPE=MinSizeRel -DCMAKE_BUILD_TYPE=MinSizeRel
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
...@@ -783,7 +776,6 @@ jobs: ...@@ -783,7 +776,6 @@ jobs:
run: > run: >
cmake -S . -B build cmake -S . -B build
-G "Visual Studio 16 2019" -A Win32 -G "Visual Studio 16 2019" -A Win32
-DCMAKE_VERBOSE_MAKEFILE=ON
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
...@@ -837,7 +829,6 @@ jobs: ...@@ -837,7 +829,6 @@ jobs:
run: > run: >
cmake -S . -B build cmake -S . -B build
-G "Visual Studio 16 2019" -A Win32 -G "Visual Studio 16 2019" -A Win32
-DCMAKE_VERBOSE_MAKEFILE=ON
-DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=Debug
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
...@@ -878,7 +869,6 @@ jobs: ...@@ -878,7 +869,6 @@ jobs:
- name: Configure C++20 - name: Configure C++20
run: > run: >
cmake -S . -B build cmake -S . -B build
-DCMAKE_VERBOSE_MAKEFILE=ON
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
-DDOWNLOAD_EIGEN=ON -DDOWNLOAD_EIGEN=ON
...@@ -930,7 +920,7 @@ jobs: ...@@ -930,7 +920,7 @@ jobs:
- name: Configure C++11 - name: Configure C++11
# LTO leads to many undefined reference like # LTO leads to many undefined reference like
# `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&) # `pybind11::detail::function_call::function_call(pybind11::detail::function_call&&)
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DCMAKE_VERBOSE_MAKEFILE=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=11 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build
- name: Build C++11 - name: Build C++11
run: cmake --build build -j 2 run: cmake --build build -j 2
...@@ -948,7 +938,7 @@ jobs: ...@@ -948,7 +938,7 @@ jobs:
run: git clean -fdx run: git clean -fdx
- name: Configure C++14 - name: Configure C++14
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DCMAKE_VERBOSE_MAKEFILE=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build2 run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=14 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build2
- name: Build C++14 - name: Build C++14
run: cmake --build build2 -j 2 run: cmake --build build2 -j 2
...@@ -966,7 +956,7 @@ jobs: ...@@ -966,7 +956,7 @@ jobs:
run: git clean -fdx run: git clean -fdx
- name: Configure C++17 - name: Configure C++17
run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DCMAKE_VERBOSE_MAKEFILE=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build3 run: cmake -G "MinGW Makefiles" -DCMAKE_CXX_STANDARD=17 -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON -S . -B build3
- name: Build C++17 - name: Build C++17
run: cmake --build build3 -j 2 run: cmake --build build3 -j 2
...@@ -1027,7 +1017,6 @@ jobs: ...@@ -1027,7 +1017,6 @@ jobs:
- name: Configure Clang - name: Configure Clang
run: > run: >
cmake -G Ninja -S . -B . cmake -G Ninja -S . -B .
-DCMAKE_VERBOSE_MAKEFILE=ON
-DPYBIND11_WERROR=OFF -DPYBIND11_WERROR=OFF
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF -DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
...@@ -1093,7 +1082,6 @@ jobs: ...@@ -1093,7 +1082,6 @@ jobs:
- name: CMake Configure - name: CMake Configure
run: > run: >
cmake -S . -B . cmake -S . -B .
-DCMAKE_VERBOSE_MAKEFILE=ON
-DPYBIND11_WERROR=ON -DPYBIND11_WERROR=ON
-DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF -DPYBIND11_SIMPLE_GIL_MANAGEMENT=OFF
-DDOWNLOAD_CATCH=ON -DDOWNLOAD_CATCH=ON
......
...@@ -9,6 +9,10 @@ on: ...@@ -9,6 +9,10 @@ on:
- stable - stable
- v* - v*
env:
# For cmake:
VERBOSE: 1
jobs: jobs:
# This tests various versions of CMake in various combinations, to make sure # This tests various versions of CMake in various combinations, to make sure
# the configure step passes. # the configure step passes.
......
...@@ -14,6 +14,8 @@ on: ...@@ -14,6 +14,8 @@ on:
env: env:
FORCE_COLOR: 3 FORCE_COLOR: 3
# For cmake:
VERBOSE: 1
jobs: jobs:
pre-commit: pre-commit:
......
...@@ -11,6 +11,8 @@ concurrency: ...@@ -11,6 +11,8 @@ concurrency:
env: env:
PIP_ONLY_BINARY: numpy PIP_ONLY_BINARY: numpy
# For cmake:
VERBOSE: 1
jobs: jobs:
standard: standard:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment