From 57e9a9eee627e2e947214d1dd54cc06150919799 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Fri, 14 Jul 2023 15:02:10 +0200 Subject: [PATCH] ci: move 'set -eu' to after source_cmd --- .github/workflows/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ab737184a..71fb85dac 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -104,8 +104,8 @@ jobs: - name: Run build-time tests (CMake) if: "! matrix.platform.autotools" run: | - set -eu ${{ matrix.platform.source_cmd }} + set -eu export SDL_TESTS_QUICK=1 ctest -VV --test-dir build/ if test "${{ runner.os }}" = "Linux"; then @@ -122,8 +122,8 @@ jobs: - name: Configure (Autotools) if: matrix.platform.autotools run: | - set -eu ${{ matrix.platform.source_cmd }} + set -eu rm -fr build-autotools mkdir build-autotools ./autogen.sh @@ -154,8 +154,8 @@ jobs: - name: Build (Autotools) if: matrix.platform.autotools run: | - set -eu ${{ matrix.platform.source_cmd }} + set -eu parallel="$(getconf _NPROCESSORS_ONLN)" make -j"${parallel}" -C build-autotools V=1 if test "${{ runner.os }}" != "macOS" ; then @@ -164,8 +164,8 @@ jobs: - name: Run build-time tests (Autotools) if: ${{ matrix.platform.autotools && (runner.os != 'macOS') }} run: | - set -eu ${{ matrix.platform.source_cmd }} + set -eu curdir="$(pwd)" parallel="$(getconf _NPROCESSORS_ONLN)" export SDL_TESTS_QUICK=1 @@ -177,8 +177,8 @@ jobs: - name: Install (Autotools) if: matrix.platform.autotools run: | - set -eu ${{ matrix.platform.source_cmd }} + set -eu curdir="$(pwd)" parallel="$(getconf _NPROCESSORS_ONLN)" make -j"${parallel}" -C build-autotools install V=1 @@ -219,8 +219,8 @@ jobs: - name: Run installed-tests (Autotools) if: "runner.os == 'Linux' && matrix.platform.autotools" run: | - set -eu ${{ matrix.platform.source_cmd }} + set -eu parallel="$(getconf _NPROCESSORS_ONLN)" sudo make -j"${parallel}" -C build-autotools install sudo make -j"${parallel}" -C build-autotools/test install