fix: GH Actions improved

daisy · Sep 18, 2024 · bd2a1bd · bd2a1bd
1 parent 55d770c
commit bd2a1bd
Showing 1 changed file with 22 additions and 5 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -61,9 +61,26 @@ jobs:
     # - name: PR action
     #   if: ${{ github.event_name == 'pull_request' }}
     #   run: echo PR
-    - name: non-PR action, Windows
+    - name: non-PR action, Windows, Puppeteer
       if: ${{ github.event_name != 'pull_request' && ( matrix.osarch == 'windows-intel' || matrix.osarch == 'windows-arm' ) }}
-      run: echo "${{ matrix.osarch }}" && yarn test && yarn test-cli && yarn test-electron && yarn test-electron-cli
-    - name: non-PR action, non-Windows
-      if: ${{ github.event_name != 'pull_request' && matrix.osarch != 'windows-intel' && matrix.osarch != 'windows-arm' }}
-      run: echo "${{ matrix.osarch }}" && yarn test && yarn test-cli && yarn test-electron && yarn test-electron-cli
+      run: echo "${{ matrix.osarch }}" && yarn test && yarn test-cli
+    - name: non-PR action, Windows, Electron
+      if: ${{ github.event_name != 'pull_request' && ( matrix.osarch == 'windows-intel' || matrix.osarch == 'windows-arm' ) }}
+      run: echo "${{ matrix.osarch }}" && yarn test-electron && yarn test-electron-cli
+    - name: non-PR action, Linux, Puppeteer
+      if: ${{ github.event_name != 'pull_request' && (matrix.osarch == 'linux-intel' || matrix.osarch == 'linux-arm') }}
+      run: echo "${{ matrix.osarch }}" && yarn test && yarn test-cli
+    - name: non-PR action, Linux, Electron
+      if: ${{ github.event_name != 'pull_request' && (matrix.osarch == 'linux-intel' || matrix.osarch == 'linux-arm') }}
+      uses: coactions/setup-xvfb@v1
+      with:
+        run: yarn test-electron && yarn test-electron-cli
+        working-directory: ./
+        # options:
+# run: echo "${{ matrix.osarch }}" && xvfb-run yarn test-electron && xvfb-run yarn test-electron-cli
+    - name: non-PR action, Mac, Puppeteer
+      if: ${{ github.event_name != 'pull_request' && (matrix.osarch == 'mac-intel' || matrix.osarch == 'mac-arm') }}
+      run: echo "${{ matrix.osarch }}" && yarn test && yarn test-cli
+    - name: non-PR action, Mac, Electron
+      if: ${{ github.event_name != 'pull_request' && (matrix.osarch == 'mac-intel' || matrix.osarch == 'mac-arm') }}
+      run: echo "${{ matrix.osarch }}" && yarn test-electron && yarn test-electron-cli