tidy up

bemanproject · Oct 22, 2024 · 231efc7 · 231efc7
1 parent f836fe2
commit 231efc7
Showing 1 changed file with 23 additions and 17 deletions.
diff --git a/.github/workflows/ci_tests.yml b/.github/workflows/ci_tests.yml
@@ -16,13 +16,14 @@ jobs:
     strategy:
       matrix:
         preset: ["gcc-debug", "gcc-release"]
+    name: "Preset Test: ${{ matrix.preset }}"
     steps:
       - uses: actions/checkout@v4
-      - name: Setup cmake
-        uses: jwlawson/actions-setup-cmake@v2
+      - name: Setup build environment
+        uses: lukka/get-cmake@latest
         with:
-          cmake-version: '3.25.x'
-      - uses: seanmiddleditch/gha-setup-ninja@v5
+          cmakeVersion: "~3.25.0"
+          ninjaVersion: "^1.11.1"
       - name: Run preset
         run: cmake --workflow --preset ${{ matrix.preset }}
 
@@ -36,7 +37,7 @@ jobs:
             c: gcc
           - cpp: clang++
             c: clang
-        cpp_version: ["17", "20", "23", "26"]
+        cpp_version: [17, 20, 23, 26]
         cmake_args:
           - description: "Default"
             args: ""
@@ -49,10 +50,18 @@ jobs:
             compiler:
               cpp: g++
               c: gcc
-            cpp_version: "17"
+            cpp_version: 17
             cmake_args:
               description: "Werror"
               cmake_args: "-DCMAKE_CXX_FLAGS='-Werror=all -Werror=extra'"
+          - platform: ubuntu-latest
+            compiler:
+              cpp: g++
+              c: gcc
+            cpp_version: 17
+            cmake_args:
+              description: "Dynamic"
+              cmake_args: "-DBUILD_SHARED_LIBS=on"
 
     name: "Bulid & Test: ${{ matrix.compiler.c }} ${{ matrix.cpp_version }} ${{ matrix.cmake_args.description }}"
     runs-on: ${{ matrix.platform }}
@@ -69,31 +78,28 @@ jobs:
           g++ --version
           cmake --version
           ninja --version
-      - name: Build Release
+      - name: Configure CMake
         run: |
           cmake -B build -S . "-DCMAKE_CXX_STANDARD=${{ matrix.cpp_version }} ${{ matrix.cmake_args.args }}"
-          cmake --build build --config Release --verbose
-          cmake --build build --config Release --target all_verify_interface_header_sets
-          cmake --install build --config Release --prefix /opt/beman.exemplar
-          find /opt/beman.exemplar -type f
         env:
           CC: ${{ matrix.compiler.c }}
           CXX: ${{ matrix.compiler.cpp }}
           CMAKE_GENERATOR: "Ninja Multi-Config"
+      - name: Build Release
+        run: |
+          cmake --build build --config Release --verbose
+          cmake --build build --config Release --target all_verify_interface_header_sets
+          cmake --install build --config Release --prefix /opt/beman.exemplar
+          find /opt/beman.exemplar -type f
       - name: Test Release
         run: ctest --test-dir build --build-config Release
       - name: Build Debug
         run: |
-          cmake -B build -S . "${{ matrix.cmake_args.args }}"
           cmake --build build --config Debug --verbose
           cmake --build build --config Debug --target all_verify_interface_header_sets
           cmake --install build --config Debug --prefix /opt/beman.exemplar
           find /opt/beman.exemplar -type f
-        env:
-          CC: ${{ matrix.compiler.c }}
-          CXX: ${{ matrix.compiler.cpp }}
-          CMAKE_GENERATOR: "Ninja Multi-Config"
-      - name: Test Release
+      - name: Test Debug
         run: ctest --test-dir build --build-config Debug
 
   create-issue-when-fault: