Windows build: Consolidate Windows workflows

.github/workflows/windows-installer.yml

@@ -1,59 +0,0 @@
-name: "Windows Installer"
-
-# any branch is useful for testing before a PR is submitted
-on: [push, pull_request]
-
-jobs:
-  build:
-    # run on pushes to any branch
-    # run on PRs from external forks
-    if: |
-      (github.event_name != 'pull_request')
-      || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
-    name: Build Zip & Exe
-    runs-on: windows-latest
-    steps:
-      -
-        uses: msys2/setup-msys2@v2
-        with:
-          path-type: inherit
-          install: >-
-            zip
-      -
-        name: Checkout repository
-        uses: actions/checkout@v3
-      -
-        uses: actions/setup-node@v3
-        with:
-          node-version: 12
-          cache: 'npm'
-          cache-dependency-path: |
-            src/package-lock.json
-            src/bin/doc/package-lock.json
-      -
-        name: Install all dependencies and symlink for ep_etherpad-lite
-        shell: msys2 {0}
-        run: src/bin/installDeps.sh
-      -
-        name: Run the backend tests
-        shell: msys2 {0}
-        run: cd src && npm test
-      -
-        name: Build the .zip
-        shell: msys2 {0}
-        run: src/bin/buildForWindows.sh
-      -
-        name: Extract the .zip into folder
-        working-directory: ..
-        run: 7z x etherpad-lite\etherpad-win.zip -oetherpad-zip
-      -
-        name: Create installer
-        uses: joncloud/makensis-action@v3.6
-        with:
-          script-file: 'src/bin/nsis/etherpad.nsi'
-      -
-        name: Archive production artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: etherpad-win.exe
-          path: etherpad-win.exe

.github/workflows/windows.yml

@@ -1,4 +1,4 @@
-name: "Windows Zip"
+name: "Windows Build"
 
 # any branch is useful for testing before a PR is submitted
 on: [push, pull_request]
@@ -7,13 +7,13 @@ permissions:
   contents: read
 
 jobs:
-  build:
+  build-zip:
     # run on pushes to any branch
     # run on PRs from external forks
     if: |
       (github.event_name != 'pull_request')
       || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
-    name: Build
+    name: Build .zip
     runs-on: windows-latest
     steps:
       -
@@ -52,7 +52,40 @@ jobs:
           name: etherpad-win.zip
           path: etherpad-win.zip
 
-  deploy:
+  build-exe:
+    if: |
+      (github.event_name != 'pull_request')
+      || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
+    name: Build .exe
+    needs: build-zip
+    runs-on: windows-latest
+    steps:
+      -
+        name: Checkout repository
+        uses: actions/checkout@v3
+      -
+        name: Download .zip
+        uses: actions/download-artifact@v3
+        with:
+          name: etherpad-win.zip
+          path: ..
+      -
+        name: Extract .zip
+        working-directory: ..
+        run: 7z x etherpad-win.zip -oetherpad-zip
+      -
+        name: Create installer
+        uses: joncloud/makensis-action@v3.6
+        with:
+          script-file: 'src/bin/nsis/etherpad.nsi'
+      -
+        name: Archive production artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: etherpad-win.exe
+          path: etherpad-win.exe
+
+  deploy-zip:
     # run on pushes to any branch
     # run on PRs from external forks
     permissions:
@@ -61,7 +94,7 @@ jobs:
       (github.event_name != 'pull_request')
       || (github.event.pull_request.head.repo.id != github.event.pull_request.base.repo.id)
     name: Deploy
-    needs: build
+    needs: build-zip
     runs-on: windows-latest
     steps:
       -