Skip to content

Commit

Permalink
workflows: Change how we make CMake verbose
Browse files Browse the repository at this point in the history
Some CI workers don't seem to understand `cmake -v`, and Windows' shell
doesn't understand `VERBOSE=1 cmake`.

Signed-off-by: Simon McVittie <[email protected]>
  • Loading branch information
smcv authored and slouken committed May 4, 2022
1 parent 4da4760 commit 79a16da
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/emscripten.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ jobs:
with:
version: 2.0.27
- name: Configure CMake
run: emcmake cmake -B build
run: emcmake cmake -B build -DCMAKE_VERBOSE_MAKEFILE=ON
- name: Build
run: cmake -v --build build/
run: cmake --build build/
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,14 +82,14 @@ jobs:
if: runner.os == 'Linux'
run: ./test/versioning.sh
- name: Configure CMake
run: cmake -B build -DSDL_TEST=ON ${{ matrix.platform.flags }}
run: cmake -B build -DSDL_TEST=ON -DCMAKE_VERBOSE_MAKEFILE=ON ${{ matrix.platform.flags }}
- name: Build
run: cmake -v --build build/ --config Release
run: cmake --build build/ --config Release
- name: Install
run: |
set -eu
rm -fr DESTDIR-cmake
DESTDIR=$(pwd)/DESTDIR-cmake cmake -v --install build/ --config Release
DESTDIR=$(pwd)/DESTDIR-cmake cmake --install build/ --config Release
( cd DESTDIR-cmake; find ) | LC_ALL=C sort -u
- name: Configure Autotools
if: runner.os == 'Linux'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/msvc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Configure CMake
run: cmake -B build -DSDL_TEST=ON ${{ matrix.platform.flags }}
- name: Build CMake
run: cmake -v --build build/ --config Release --parallel
run: cmake --build build/ --config Release --parallel

- name: Add msbuild to PATH
if: ${{ matrix.platform.project != '' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/riscos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ jobs:
run: apt-get update && apt-get install -y cmake ninja-build
- uses: actions/checkout@v2
- name: Configure CMake
run: cmake -S. -Bbuild -G Ninja -DCMAKE_TOOLCHAIN_FILE=/home/riscos/env/toolchain-riscos.cmake -DRISCOS=ON -DSDL_GCC_ATOMICS=OFF -DCMAKE_BUILD_TYPE=Release
run: cmake -S. -Bbuild -G Ninja -DCMAKE_TOOLCHAIN_FILE=/home/riscos/env/toolchain-riscos.cmake -DRISCOS=ON -DSDL_GCC_ATOMICS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON
- name: Build
run: cmake -v --build build
run: cmake --build build

0 comments on commit 79a16da

Please sign in to comment.