Github action: Use the same config for build/ctest on all OSes

osmcode · Dec 17, 2024 · 430faea · 430faea
1 parent 8407a62
commit 430faea
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 27 deletions.
diff --git a/.github/actions/build-windows/action.yml b/.github/actions/build-windows/action.yml
diff --git 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
diff --git 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
@@ -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