From 430faea35fb4fb3044fa0468840a5cbd46f2e750 Mon Sep 17 00:00:00 2001 From: Jochen Topf Date: Tue, 17 Dec 2024 12:02:31 +0100 Subject: [PATCH] Github action: Use the same config for build/ctest on all OSes --- .github/actions/build-windows/action.yml | 10 ---------- .github/actions/build/action.yml | 2 +- .github/actions/ctest-windows/action.yml | 10 ---------- .github/actions/ctest/action.yml | 4 ++-- .github/workflows/ci.yml | 8 ++++---- 5 files changed, 7 insertions(+), 27 deletions(-) delete mode 100644 .github/actions/build-windows/action.yml delete mode 100644 .github/actions/ctest-windows/action.yml diff --git a/.github/actions/build-windows/action.yml b/.github/actions/build-windows/action.yml deleted file mode 100644 index 1514577a..00000000 --- a/.github/actions/build-windows/action.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: Windows Build - -runs: - using: composite - steps: - - name: Build - run: cmake --build . --config Release --verbose - shell: bash - working-directory: build - diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 81161d5e..59de40e0 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -4,7 +4,7 @@ runs: using: composite steps: - name: Build - run: make VERBOSE=1 + run: cmake --build . --config Release --verbose shell: bash working-directory: build diff --git a/.github/actions/ctest-windows/action.yml b/.github/actions/ctest-windows/action.yml deleted file mode 100644 index 5c56da4d..00000000 --- a/.github/actions/ctest-windows/action.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: Windows Test - -runs: - using: composite - steps: - - name: Test - run: ctest --output-on-failure -C Release - shell: bash - working-directory: build - diff --git a/.github/actions/ctest/action.yml b/.github/actions/ctest/action.yml index ae0d9bb3..2f0a8736 100644 --- a/.github/actions/ctest/action.yml +++ b/.github/actions/ctest/action.yml @@ -1,10 +1,10 @@ -name: ctest +name: Test runs: using: composite steps: - name: Test - run: ctest --output-on-failure + run: ctest --output-on-failure -C Release shell: bash working-directory: build diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b619d5a..4398a84c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -231,8 +231,8 @@ jobs: - uses: ./.github/actions/install-windows - uses: ./.github/actions/install-protozero - uses: ./.github/actions/cmake-windows - - uses: ./.github/actions/build-windows - - uses: ./.github/actions/ctest-windows + - uses: ./.github/actions/build + - uses: ./.github/actions/ctest windows-2019-full: runs-on: windows-2019 @@ -246,5 +246,5 @@ jobs: shell: bash - uses: ./.github/actions/install-protozero - uses: ./.github/actions/cmake-windows - - uses: ./.github/actions/build-windows - - uses: ./.github/actions/ctest-windows + - uses: ./.github/actions/build + - uses: ./.github/actions/ctest