Stop doing cross builds

paranext · Oct 5, 2023 · 70a0ef9 · 70a0ef9
1 parent e2c0ddb
commit 70a0ef9
Showing 1 changed file with 15 additions and 14 deletions.
diff --git a/.github/workflows/package-main.yml b/.github/workflows/package-main.yml
@@ -19,7 +19,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-latest, ubuntu-latest]
+        os: [windows-latest, macos-latest, ubuntu-latest]
         dotnet_version: [7.0.x]
         node_version: [18.x]
 
@@ -52,11 +52,12 @@ jobs:
           echo "Updating version from ${CURRENT_VERSION} to ${NEW_VERSION}"
           npm version $NEW_VERSION
 
-      - name: dotnet build - Windows on macOS
-        if: ${{ matrix.os == 'macos-latest' }}
-        run: npm run build:data-release:windows
+      - name: Publish releases - Windows
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+          npm exec electron-builder -- build --publish never --win
 
-      - name: Publish releases - Windows and macOS
+      - name: Publish releases - macOS
         if: ${{ matrix.os == 'macos-latest' }}
         # env:
         #   # These values are used for auto updates signing
@@ -65,7 +66,7 @@ jobs:
         #   CSC_LINK: ${{ secrets.CSC_LINK }}
         #   CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
         run: |
-          npm exec electron-builder -- build --publish never --win --mac
+          npm exec electron-builder -- build --publish never --mac
 
       - name: Publish releases - Linux
         if: ${{ matrix.os == 'ubuntu-latest' }}
@@ -75,22 +76,22 @@ jobs:
         run: |
           npm exec electron-builder -- build --publish never --linux
 
-      - name: Upload macOS artifacts
-        if: ${{ matrix.os == 'macos-latest' }}
+      - name: Upload Windows artifacts
+        if: ${{ matrix.os == 'windows-latest' }}
         uses: actions/upload-artifact@v3
         with:
-          name: app-macos
+          name: app-windows
           path: |
-            ./release/build/*.dmg
+            ./release/build/*.exe
+            !./release/build/*Setup*.exe
 
-      - name: Upload Windows artifacts
+      - name: Upload macOS artifacts
         if: ${{ matrix.os == 'macos-latest' }}
         uses: actions/upload-artifact@v3
         with:
-          name: app-windows
+          name: app-macos
           path: |
-            ./release/build/*.exe
-            !./release/build/*Setup*.exe
+            ./release/build/*.dmg
 
       - name: Upload Linux artifacts
         if: ${{ matrix.os == 'ubuntu-latest' }}