From 50bc01369519d5eaba6472816a7917c596cb31a5 Mon Sep 17 00:00:00 2001
From: Simon McVittie <[EMAIL REDACTED]>
Date: Wed, 4 May 2022 17:45:26 +0100
Subject: [PATCH] workflows: Tell CMake and Makefile.in to show compiler
command-lines
This is usually desirable for batch processing: it lets us see exactly
what is happening in the logs.
Signed-off-by: Simon McVittie <smcv@collabora.com>
---
.github/workflows/emscripten.yml | 2 +-
.github/workflows/main.yml | 16 ++++++++--------
.github/workflows/msvc.yml | 2 +-
.github/workflows/riscos.yml | 4 ++--
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
index 633c391252b..9ab554bb128 100644
--- a/.github/workflows/emscripten.yml
+++ b/.github/workflows/emscripten.yml
@@ -13,4 +13,4 @@ jobs:
- name: Configure CMake
run: emcmake cmake -B build
- name: Build
- run: cmake --build build/
+ run: cmake -v --build build/
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index fc02d8c9d76..59ab6fe4104 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -75,19 +75,19 @@ jobs:
git clone --depth 1 https://gitlab.gnome.org/jadahl/libdecor.git --branch 0.1.0
cd libdecor
meson build --buildtype release -Ddemo=false -Ddbus=disabled
- ninja -C build
+ ninja -v -C build
sudo meson install -C build
- uses: actions/checkout@v2
- name: Configure CMake
run: cmake -B build -DSDL_TEST=ON ${{ matrix.platform.flags }}
- name: Build
- run: cmake --build build/ --config Release
+ run: cmake -v --build build/ --config Release
- name: Install
run: |
set -eu
- cmake --build build/ --config Release
+ cmake -v --build build/ --config Release
rm -fr DESTDIR-cmake
- DESTDIR=$(pwd)/DESTDIR-cmake cmake --install build/ --config Release
+ DESTDIR=$(pwd)/DESTDIR-cmake cmake -v --install build/ --config Release
( cd DESTDIR-cmake; find ) | LC_ALL=C sort -u
- name: Configure Autotools
if: runner.os == 'Linux'
@@ -116,10 +116,10 @@ jobs:
set -eu
curdir="$(pwd)"
parallel="$(getconf _NPROCESSORS_ONLN)"
- make -j"${parallel}" -C build-autotools
- make -j"${parallel}" -C build-autotools/test
+ make -j"${parallel}" -C build-autotools V=1
+ make -j"${parallel}" -C build-autotools/test V=1
rm -fr DESTDIR-autotools
mkdir DESTDIR-autotools
- make -j"${parallel}" -C build-autotools install DESTDIR="${curdir}/DESTDIR-autotools"
+ make -j"${parallel}" -C build-autotools install DESTDIR="${curdir}/DESTDIR-autotools" V=1
( cd DESTDIR-autotools; find ) | LC_ALL=C sort -u
- make -j"${parallel}" -C build-autotools dist
+ make -j"${parallel}" -C build-autotools dist V=1
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
index ca78cb1c74f..a6705d845c7 100644
--- a/.github/workflows/msvc.yml
+++ b/.github/workflows/msvc.yml
@@ -23,7 +23,7 @@ jobs:
- name: Configure CMake
run: cmake -B build -DSDL_TEST=ON ${{ matrix.platform.flags }}
- name: Build CMake
- run: cmake --build build/ --config Release --parallel
+ run: cmake -v --build build/ --config Release --parallel
- name: Add msbuild to PATH
if: ${{ matrix.platform.project != '' }}
diff --git a/.github/workflows/riscos.yml b/.github/workflows/riscos.yml
index 3f46668b7e5..aa8233bd734 100644
--- a/.github/workflows/riscos.yml
+++ b/.github/workflows/riscos.yml
@@ -12,7 +12,7 @@ jobs:
- name: Configure
run: ./configure --host=arm-unknown-riscos --disable-gcc-atomics
- name: Build
- run: make -j`nproc`
+ run: make -j`nproc` V=1
cmake:
name: CMake
@@ -25,4 +25,4 @@ jobs:
- 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
- name: Build
- run: cmake --build build
+ run: cmake -v --build build