Skip to content

Commit

Permalink
Systematically using --verbose for compilations where possible (cmake…
Browse files Browse the repository at this point in the history 
… 3.14 or newer).

Also changing all `cmake -t` to `--target`, `-v` to `--verbose`, `check` to `pytest`, for consistency (to make it easier to pin-point all commands of a certain type).

Also removing one `-j 2` for `pytest` in hopes of reducing flakes due to races in test_iostream and in prints from destructors.
  • Loading branch information
Ralf W. Grosse-Kunstleve committed Aug 15, 2021
1 parent 869bcc5 commit 53ef29b
Showing 1 changed file with 32 additions and 32 deletions.
64 changes: 32 additions & 32 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,18 @@ jobs:
${{ matrix.args }}
- name: Build C++11
run: cmake --build . -j 2
run: cmake --build . --verbose -j 2

- name: Python tests C++11
run: cmake --build . --target pytest -j 2
run: cmake --build . --target pytest

- name: C++11 tests
# TODO: Figure out how to load the DLL on Python 3.8+
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
run: cmake --build . --target cpptest -j 2
run: cmake --build . --verbose --target cpptest -j 2

- name: Interface test C++11
run: cmake --build . --target test_cmake_build
run: cmake --build . --verbose --target test_cmake_build

- name: Clean directory
run: git clean -fdx
Expand All @@ -134,18 +134,18 @@ jobs:
${{ matrix.args2 }}
- name: Build
run: cmake --build build2 -j 2
run: cmake --build build2 --verbose -j 2

- name: Python tests
run: cmake --build build2 --target pytest

- name: C++ tests
# TODO: Figure out how to load the DLL on Python 3.8+
if: "!(runner.os == 'Windows' && (matrix.python == 3.8 || matrix.python == 3.9 || matrix.python == '3.10-dev'))"
run: cmake --build build2 --target cpptest
run: cmake --build build2 --verbose --target cpptest

- name: Interface test
run: cmake --build build2 --target test_cmake_build
run: cmake --build build2 --verbose --target test_cmake_build

# Eventually Microsoft might have an action for setting up
# MSVC, but for now, this action works:
Expand Down Expand Up @@ -234,17 +234,17 @@ jobs:
-DCMAKE_CXX_STANDARD=17
- name: Build
run: cmake --build build -j 2
run: cmake --build build --verbose -j 2

- name: Python tests
run: cmake --build build --target pytest

- name: C++ tests
run: cmake --build build --target cpptest
run: cmake --build build --verbose --target cpptest

- name: Run Valgrind on Python tests
if: matrix.valgrind
run: cmake --build build --target memcheck
run: cmake --build build --verbose --target memcheck


# Testing on clang using the excellent silkeh clang docker images
Expand Down Expand Up @@ -318,7 +318,7 @@ jobs:
run: cmake -S . -B build -DPYBIND11_CUDA_TESTS=ON -DPYBIND11_WERROR=ON -DDOWNLOAD_CATCH=ON

- name: Build
run: cmake --build build -j2 --verbose
run: cmake --build build --verbose -j2

- name: Python tests
run: cmake --build build --target pytest
Expand Down Expand Up @@ -400,7 +400,7 @@ jobs:
# Building before installing Pip should produce a warning but not an error
- name: Build
run: cmake3 --build build -j 2 --verbose
run: cmake3 --build build -j 2

- name: Install CMake with pip
run: |
Expand Down Expand Up @@ -457,16 +457,16 @@ jobs:
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- name: Build
run: cmake --build build -j 2
run: cmake --build build --verbose -j 2

- name: Python tests
run: cmake --build build --target pytest

- name: C++ tests
run: cmake --build build --target cpptest
run: cmake --build build --verbose --target cpptest

- name: Interface test
run: cmake --build build --target test_cmake_build
run: cmake --build build --verbose --target test_cmake_build


# Testing on ICC using the oneAPI apt repo
Expand Down Expand Up @@ -515,23 +515,23 @@ jobs:
- name: Build C++11
run: |
set +e; source /opt/intel/oneapi/setvars.sh; set -e
cmake --build build-11 -j 2 -v
cmake --build build-11 --verbose -j 2
- name: Python tests C++11
run: |
set +e; source /opt/intel/oneapi/setvars.sh; set -e
sudo service apport stop
cmake --build build-11 --target check
cmake --build build-11 --target pytest
- name: C++ tests C++11
run: |
set +e; source /opt/intel/oneapi/setvars.sh; set -e
cmake --build build-11 --target cpptest
cmake --build build-11 --verbose --target cpptest
- name: Interface test C++11
run: |
set +e; source /opt/intel/oneapi/setvars.sh; set -e
cmake --build build-11 --target test_cmake_build
cmake --build build-11 --verbose --target test_cmake_build
- name: Configure C++17
run: |
Expand All @@ -547,23 +547,23 @@ jobs:
- name: Build C++17
run: |
set +e; source /opt/intel/oneapi/setvars.sh; set -e
cmake --build build-17 -j 2 -v
cmake --build build-17 --verbose -j 2
- name: Python tests C++17
run: |
set +e; source /opt/intel/oneapi/setvars.sh; set -e
sudo service apport stop
cmake --build build-17 --target check
cmake --build build-17 --target pytest
- name: C++ tests C++17
run: |
set +e; source /opt/intel/oneapi/setvars.sh; set -e
cmake --build build-17 --target cpptest
cmake --build build-17 --verbose --target cpptest
- name: Interface test C++17
run: |
set +e; source /opt/intel/oneapi/setvars.sh; set -e
cmake --build build-17 --target test_cmake_build
cmake --build build-17 --verbose --target test_cmake_build
# Testing on CentOS (manylinux uses a centos base, and this is an easy way
Expand Down Expand Up @@ -614,16 +614,16 @@ jobs:
-DPYTHON_EXECUTABLE=$(python3 -c "import sys; print(sys.executable)")
- name: Build
run: cmake --build build -j 2
run: cmake --build build --verbose -j 2

- name: Python tests
run: cmake --build build --target pytest

- name: C++ tests
run: cmake --build build --target cpptest
run: cmake --build build --verbose --target cpptest

- name: Interface test
run: cmake --build build --target test_cmake_build
run: cmake --build build --verbose --target test_cmake_build


# This tests an "install" with the CMake tools
Expand Down Expand Up @@ -758,7 +758,7 @@ jobs:
-DDOWNLOAD_EIGEN=ON
${{ matrix.args }}
- name: Build C++11
run: cmake --build build -j 2
run: cmake --build build --verbose -j 2

- name: Python tests
run: cmake --build build -t pytest
Expand Down Expand Up @@ -804,10 +804,10 @@ jobs:
-DDOWNLOAD_EIGEN=ON
- name: Build C++14
run: cmake --build build -j 2
run: cmake --build build --verbose -j 2

- name: Run all checks
run: cmake --build build -t check
run: cmake --build build --target pytest


win32-msvc2017:
Expand Down Expand Up @@ -855,10 +855,10 @@ jobs:
${{ matrix.args }}
- name: Build ${{ matrix.std }}
run: cmake --build build -j 2
run: cmake --build build --verbose -j 2

- name: Run all checks
run: cmake --build build -t check
run: cmake --build build --target pytest

mingw:
runs-on: windows-latest
Expand Down Expand Up @@ -886,7 +886,7 @@ jobs:
run: cmake -G "MinGW Makefiles" -S . -B build

- name: Build
run: cmake --build build -j 2
run: cmake --build build --verbose -j 2

- name: Python tests
run: cmake --build build --target pytest

0 comments on commit 53ef29b

Please sign in to comment.