GHI #20 Minor fix for workflow, 22/...

doodspav · Oct 30, 2023 · 6442e97 · 6442e97
1 parent de4840e
commit 6442e97
Showing 1 changed file with 26 additions and 31 deletions.
diff --git a/.github/workflows/test-base.yml b/.github/workflows/test-base.yml
@@ -10,45 +10,40 @@ jobs:
     runs-on: ${{ matrix.platform.os }}
     strategy:
       matrix:
-        # verbose labels make things easier to read in GitHub Actions
+        # platforms needed to combine presets and os
         platform:
-          - arch: windows-msvc-x86
-            os: windows-latest
+          - os: windows-latest
             preset: patomic-ci-windows-msvc -A Win32
-          - arch: windows-msvc-x64
-            os: windows-latest
+          - os: windows-latest
             preset: patomic-ci-windows-msvc -A x64
-          - arch: macos-clang-x86_64
-            os: macos-latest
+          - os: macos-latest
             preset: patomic-ci-macos-clang
-          - arch: ubuntu-clang-x86_64
-            os: ubuntu-latest
+          - os: ubuntu-latest
             preset: patomic-ci-clang
-          - arch: ubuntu-clang-ansi-x86_64
-            os: ubuntu-latest
+          - os: ubuntu-latest
             preset: patomic-ci-clang-ansi
-          - arch: ubuntu-gcc-x86_64
-            os: ubuntu-latest
+          - os: ubuntu-latest
             preset: patomic-ci-gcc
-          - arch: ubuntu-gcc-ansi-x86_64
-            os: ubuntu-latest
+          - os: ubuntu-latest
             preset: patomic-ci-gcc-ansi
-        # build-type:
-        #   - debug
-        #   - release
-        # build-shared:
-        #   - static
-        #   - shared
-        # include:
-        #   # convert matrix options to cmake options
-        #   - build-type: debug
-        #     cmake-build-type: Debug
-        #   - build-type: release
-        #     cmake-build-type: Release
-        #   - build-shared: static
-        #     cmake-build-shared: OFF
-        #   - build-shared: shared
-        #     cmake-build-shared: ON
+        # verbose labels make things easier to read in GitHub Actions
+        build-type:
+          - debug
+          - release
+        build-shared:
+          - static
+          - shared
+        # convert matrix options to cmake options
+        include:
+          # convert matrix options to cmake options
+          - build-type: debug
+            cmake-build-type: Debug
+          - build-type: release
+            cmake-build-type: Release
+          - build-shared: static
+            cmake-build-shared: OFF
+          - build-shared: shared
+            cmake-build-shared: ON
 
     steps:
       - name: Checkout patomic