Fix bad formatting of test workflow YAML files

SSoelvsten · Sep 22, 2023 · be1add4 · be1add4
1 parent 1e79d47
commit be1add4
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 49 deletions.
diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml
@@ -9,7 +9,7 @@ on:
     - master
 
 jobs:
-  skip_duplicate:
+  check_skip:
     name: 'Skip job? (Linux)'
     continue-on-error: true
     runs-on: ubuntu-latest
@@ -23,12 +23,12 @@ jobs:
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
 
-  build_test:
+  build_and_test:
     name: 'Build + Test (Linux, ${{matrix.cc.cc}}-${{matrix.cc.v}}, ${{matrix.build_type}})'
     runs-on: ${{ matrix.os }}
 
-    needs: skip_duplicate
-    if: ${{ needs.skip_duplicate.outputs.should_skip != 'true' }}
+    needs: check_skip
+    if: ${{ needs.check_skip.outputs.should_skip != 'true' }}
 
     strategy:
       fail-fast: false
@@ -118,28 +118,28 @@ jobs:
         pip install cmakeast
         python3 scripts/check_missing_ctests.py
 
-  build_skip:
+  skip:
     name: 'Build + Test (Linux, ${{matrix.cc.cc}}-${{matrix.cc.v}}, ${{matrix.build_type}})'
     runs-on: ubuntu-latest
 
-    needs: skip_duplicate
-    if: ${{ needs.skip_duplicate.outputs.should_skip == 'true' }}
-
-  strategy:
-    fail-fast: false
-    matrix:
-      os: [ubuntu-latest]
-      build_type: [Release, Debug]
-      cc:
-        # GNU Compiler
-        - { cc: gcc,   v: 10, cxx: g++ } # oldest possible
-        - { cc: gcc,   v: 11, cxx: g++ } # default
-        - { cc: gcc,   v: 12, cxx: g++ } # newest
-
-        # Clang Compiler
-        - { cc: clang, v: 11, cxx: clang++ } # oldest possible
-        - { cc: clang, v: 14, cxx: clang++ } # default
-        - { cc: clang, v: 15, cxx: clang++ } # newst possible
+    needs: check_skip
+    if: ${{ needs.check_skip.outputs.should_skip == 'true' }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        build_type: [Release, Debug]
+        cc:
+          # GNU Compiler
+          - { cc: gcc,   v: 10, cxx: g++ } # oldest possible
+          - { cc: gcc,   v: 11, cxx: g++ } # default
+          - { cc: gcc,   v: 12, cxx: g++ } # newest
+
+          # Clang Compiler
+          - { cc: clang, v: 11, cxx: clang++ } # oldest possible
+          - { cc: clang, v: 14, cxx: clang++ } # default
+          - { cc: clang, v: 15, cxx: clang++ } # newst possible
 
     steps:
     - name: Echo skip

diff --git a/.github/workflows/test_mac.yml b/.github/workflows/test_mac.yml
@@ -9,7 +9,7 @@ on:
     - master
 
 jobs:
-  skip_duplicate:
+  check_skip:
     name: 'Skip job? (Mac OS)'
     continue-on-error: true
     runs-on: ubuntu-latest
@@ -23,12 +23,12 @@ jobs:
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
 
-  build_test:
+  build_and_test:
     name: 'Build + Test (Mac OS, ${{matrix.cc.cc}}@${{matrix.cc.v || matrix.cc.xcode}}, ${{matrix.build_type}})'
     runs-on: ${{ matrix.os }}
 
-    needs: skip_duplicate
-    if: ${{ needs.skip_duplicate.outputs.should_skip != 'true' }}
+    needs: check_skip
+    if: ${{ needs.check_skip.outputs.should_skip != 'true' }}
 
     strategy:
       fail-fast: false
@@ -116,21 +116,28 @@ jobs:
         pip3 install cmakeast
         python3 scripts/check_missing_ctests.py
 
-  strategy:
-    fail-fast: false
-    matrix:
-      os: [ubuntu-latest]
-      build_type: [Release, Debug]
-      cc:
-        # GNU Compiler
-        - { cc: gcc,   v: 10, cxx: g++ } # oldest possible
-        - { cc: gcc,   v: 11, cxx: g++ } # default
-        - { cc: gcc,   v: 12, cxx: g++ } # newest
-
-        # Clang Compiler
-        - { cc: clang, v: 11, cxx: clang++ } # oldest possible
-        - { cc: clang, v: 14, cxx: clang++ } # default
-        - { cc: clang, v: 15, cxx: clang++ } # newst possible
+  skip:
+    name: 'Build + Test (Mac OS, ${{matrix.cc.cc}}@${{matrix.cc.v || matrix.cc.xcode}}, ${{matrix.build_type}})'
+    runs-on: ubuntu-latest
+
+    needs: check_skip
+    if: ${{ needs.check_skip.outputs.should_skip == 'true' }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        build_type: [Release, Debug]
+        cc:
+          # GNU Compiler
+          - { cc: gcc,   v: 10, cxx: g++ } # oldest possible
+          - { cc: gcc,   v: 11, cxx: g++ } # default
+          - { cc: gcc,   v: 12, cxx: g++ } # newest
+
+          # Clang Compiler
+          - { cc: clang, v: 11, cxx: clang++ } # oldest possible
+          - { cc: clang, v: 14, cxx: clang++ } # default
+          - { cc: clang, v: 15, cxx: clang++ } # newst possible
 
     steps:
     - name: Echo skip

diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml
@@ -9,7 +9,7 @@ on:
     - master
 
 jobs:
-  skip_duplicate:
+  check_skip:
     name: 'Skip job? (Windows)'
     continue-on-error: true
     runs-on: ubuntu-latest
@@ -23,12 +23,12 @@ jobs:
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
 
-  build_test:
+  build_and_test:
     name: 'Build + Test (Windows, ${{matrix.build_type}})'
     runs-on: windows-latest
 
-    needs: skip_duplicate
-    if: ${{ needs.skip_duplicate.outputs.should_skip != 'true' }}
+    needs: check_skip
+    if: ${{ needs.check_skip.outputs.should_skip != 'true' }}
 
     strategy:
       fail-fast: false
@@ -74,12 +74,12 @@ jobs:
         cd ${{github.workspace}}\build
         ctest
 
-  build_skip:
+  skip:
     name: 'Build + Test (Windows, ${{matrix.build_type}})'
     runs-on: ubuntu-latest
 
-    needs: skip_duplicate
-    if: ${{ needs.skip_duplicate.outputs.should_skip == 'true' }}
+    needs: check_skip
+    if: ${{ needs.check_skip.outputs.should_skip == 'true' }}
 
     strategy:
       fail-fast: false