Set test job conditions

electronicarts · Oct 6, 2024 · d18c874 · d18c874
1 parent f4dad7a
commit d18c874
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -11,11 +11,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, windows-latest]
         #ubuntu-latest, macos-latest, windows-latest]
         include:
-          #  - os: windows-latest
-          #    triplet: x64-windows
+           - os: windows-latest
+             triplet: x64-windows
            - os: ubuntu-latest
              triplet: x64-linux
           # - os: macos-latest
@@ -103,18 +103,20 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: [ubuntu-latest, windows-latest]
         #ubuntu-latest, macos-latest, windows-latest]
         include:
-          # - os: windows-latest
-          #   triplet: x64-windows
+          - os: windows-latest
+            triplet: x64-windows
           - os: ubuntu-latest
             triplet: x64-linux
           # - os: macos-latest
           #   triplet: x64-osx
 
     continue-on-error: true
 
+    if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main')
+
     steps:
       - name: Set environment variable in lowercase letters
         run: echo "CURRENT_OS=$(echo $RUNNER_OS | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV