updating GitHub pipeline

agracio · Sep 17, 2024 · 75cc7f6 · 75cc7f6
1 parent 8e8e06f
commit 75cc7f6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 33 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,14 +9,15 @@ env:
 
 jobs:
   build:
-    runs-on: windows-2022
+    runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
-        # electron: [29.0.0, 30.0.0, 31.0.0]
-        electron: [29.0.0]
+        electron: [29.0.0, 30.0.0, 31.0.0]
+        # electron: [29.0.0]
+        os: [windows-2022]
 
-    name: build electron-${{ matrix.electron }}
+    name: build ${{ matrix.os }}-v${{ matrix.electron }}
     steps:
 
       - name: Checkout code
@@ -84,12 +85,12 @@ jobs:
     needs: build
     strategy:
       matrix:
-        # electron: [29.4.6, 30.5.1, 31.6.0]
-        electron: [29.4.6]
+        electron: [29.4.6, 30.5.1, 31.6.0]
+        # electron: [29.4.6]
         os: [windows-2022]
       fail-fast: false
 
-    name: test electron-${{ matrix.electron }}
+    name: test ${{ matrix.os }}-v${{ matrix.electron }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -134,5 +135,6 @@ jobs:
         uses: ./.github/actions/create-test-report
         with:
           electron: ${{ matrix.electron }}
+          os: ${{ matrix.os }}
 
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -31,7 +31,6 @@ on:
       - '.circleci/*'
       - 'README.md'
 
-
 env:
   ACTIONS_ALLOW_UNSECURE_COMMANDS: true # required to setup CSC
   DOTNET_CLI_TELEMETRY_OPTOUT: 1 
@@ -42,10 +41,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # os: [macos-13, macos-14, ubuntu-22.04, windows-2022]
-        os: [ windows-2022,  ubuntu-22.04]
-        electron: [30.5.1]
-        # electron: [29.4.6, 30.5.1, 31.6.0]
+        os: [macos-13, macos-14, ubuntu-22.04, windows-2022]
+        # os: [ windows-2022,  ubuntu-22.04]
+        electron: [29.4.6, 30.5.1, 31.6.0]
         # electron: [31.6.0, 32.1.0]
 
     name: test-${{ matrix.os }}-v${{ matrix.electron }}
@@ -99,24 +97,4 @@ jobs:
           electron: ${{ matrix.electron }}
           os: ${{ matrix.os }}
 
-      # - name: "Merge test files"
-      #   run: node tools/mergeTests.js
-
-      # - name: Upload artifacts
-      #   uses: actions/upload-artifact@v4
-      #   if: success()
-      #   with:
-      #     name: ${{ matrix.os }}-${{ matrix.electron }}
-      #     path: |
-      #       test/mochawesome-report/mochawesome.json
-      #       test/mochawesome-report/mochawesome.html
-
-      # - name: Create test report
-      #   uses: phoenix-actions/test-reporting@v15
-      #   if: success()
-      #   with:
-      #     name: test-results-${{ matrix.os }}-v${{ matrix.electron }}
-      #     fail-on-error: true
-      #     path: test/mochawesome-report/mochawesome.json   # Path to test results
-      #     reporter: mochawesome-json