WIP: put uses back

Author: jordan-evens

.github/workflows/cmake-test.yml

@@ -8,29 +8,28 @@ on:
 
 jobs:
   cmake-test-macos:
+    uses: ./.github/workflows/cmake-test-on.yml
+    with:
+      os: ${{ matrix.os }}
+      os_version: ${{ matrix.os_version }}
+      compiler: ${{ matrix.compiler }}
+      triplet: ${{ matrix.target-cpu }}-${{ matrix.target-os }}
+      variant: ${{ matrix.variant }}
     strategy:
-      fail-fast: false
-      matrix:
-        os: [macos]
-        os_version: [latest]
-        compiler: [clang++]
-        variant: [Debug, Release]
-        include:
-          - os: macos
-            target-cpu: arm64
-            target-os: osx
-            target-compiler: clang
+        fail-fast: false
+        matrix:
+          os: [macos]
+          os_version: [latest]
+          compiler: [clang++]
+          variant: [Debug, Release]
+          include:
+            - os: macos
+              target-cpu: arm64
+              target-os: osx
+              target-compiler: clang
     env:
       OUTPUT_BINARY: firestarr-${{ matrix.os }}-${{ matrix.target-cpu}}-${{ matrix.target-compiler }}-${{ matrix.variant }}
     steps:
-      - uses: ./.github/workflows/cmake-test-on.yml
-        with:
-          os: ${{ matrix.os }}
-          os_version: ${{ matrix.os_version }}
-          compiler: ${{ matrix.compiler }}
-          triplet: ${{ matrix.target-cpu }}-${{ matrix.target-os }}
-          variant: ${{ matrix.variant }}
-
       - name: Locate binary
         id: locate
         run: |
@@ -82,6 +81,13 @@ jobs:
 
 
   cmake-test-ubuntu:
+    uses: ./.github/workflows/cmake-test-on.yml
+    with:
+      os: ${{ matrix.os }}
+      os_version: ${{ matrix.os_version }}
+      compiler: ${{ matrix.compiler }}
+      triplet: ${{ matrix.target-cpu }}-${{ matrix.target-os }}
+      variant: ${{ matrix.variant }}
     strategy:
       fail-fast: false
       matrix:
@@ -100,14 +106,6 @@ jobs:
     env:
       OUTPUT_BINARY: firestarr-${{ matrix.os }}-${{ matrix.target-cpu}}-${{ matrix.target-compiler }}-${{ matrix.variant }}
     steps:
-      - uses: ./.github/workflows/cmake-test-on.yml
-        with:
-          os: ${{ matrix.os }}
-          os_version: ${{ matrix.os_version }}
-          compiler: ${{ matrix.compiler }}
-          triplet: ${{ matrix.target-cpu }}-${{ matrix.target-os }}
-          variant: ${{ matrix.variant }}
-
       - name: Locate binary
         id: locate
         run: |
@@ -159,6 +157,13 @@ jobs:
 
 
   cmake-test-windows:
+    uses: ./.github/workflows/cmake-test-on.yml
+    with:
+      os: ${{ matrix.os }}
+      os_version: ${{ matrix.os_version }}
+      compiler: ${{ matrix.compiler }}
+      triplet: ${{ matrix.target-cpu }}-${{ matrix.target-os }}
+      variant: ${{ matrix.variant }}
     strategy:
       fail-fast: false
       matrix:
@@ -174,14 +179,6 @@ jobs:
     env:
       OUTPUT_BINARY: firestarr-${{ matrix.os }}-${{ matrix.target-cpu}}-${{ matrix.target-compiler }}-${{ matrix.variant }}
     steps:
-      - uses: ./.github/workflows/cmake-test-on.yml
-        with:
-          os: ${{ matrix.os }}
-          os_version: ${{ matrix.os_version }}
-          compiler: ${{ matrix.compiler }}
-          triplet: ${{ matrix.target-cpu }}-${{ matrix.target-os }}
-          variant: ${{ matrix.variant }}
-
       - name: Locate binary
         id: locate
         run: |