Merge remote-tracking branch 'upstream/master' into dev

Author: Bilb

.github/workflows/build-binaries.yml

@@ -16,6 +16,16 @@ on:
       - dev
       - 'release/**'
       - 'ci/**'
+  workflow_dispatch:
+    inputs:
+      target_branch:
+        description: 'Branch to make a release of'
+        required: true
+        default: 'dev'
+
+# Dynamic name for the run
+run-name: >
+  Session Desktop ${{ github.event_name == 'workflow_dispatch' && format('(manual run on {0})', github.event.inputs.target_branch) || format('(push)', github.event.pull_request.number || github.ref) }}
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -27,15 +37,14 @@ env:
   SHOULD_PUBLISH_ALPHA: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release') && contains(github.ref, '-alpha.') }}
 
 jobs:
-  create_draft_release:
+  create_draft_release_if_needed:
     runs-on: ubuntu-latest
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     outputs:
       version_tag: ${{ steps.get_version.outputs.VERSION_TAG }}
     steps:
       - name: Checkout git repo
-        # only run this on "push" to "master" or alpha releases
         uses: actions/checkout@v4
         # We only need a few files in this run, no point cloning everything
         with:
@@ -44,6 +53,7 @@ jobs:
             build/release-notes.md
             build/release-notes-alpha.md
           sparse-checkout-cone-mode: false
+          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target_branch || github.ref  }}
 
       - name: Get version tag from package.json
         id: get_version
@@ -61,10 +71,15 @@ jobs:
           draft: true
           bodyFile: ${{ env.SHOULD_PUBLISH_ALPHA == 'true' && 'build/release-notes-alpha.md' || 'build/release-notes.md' }}
           allowUpdates: true
+          skipIfReleaseExists: true
+          omitBodyDuringUpdate: true
+          omitDraftDuringUpdate: true
+          omitNameDuringUpdate: true
+          omitPrereleaseDuringUpdate: true
 
   build_linux:
     runs-on: ubuntu-22.04
-    needs: [create_draft_release]
+    needs: [create_draft_release_if_needed]
     strategy:
       fail-fast: false
       matrix:
@@ -78,6 +93,8 @@ jobs:
 
       - name: Checkout git repo
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target_branch || github.ref  }}
 
       - name: Setup & Build
         uses: ./actions/setup_and_build
@@ -133,7 +150,7 @@ jobs:
           path: dist/latest-linux-${{ matrix.pkg_to_build }}-${{ github.sha }}.yml
 
   post_build_linux:
-    needs: [build_linux]
+    needs: [create_draft_release_if_needed, build_linux]
     runs-on: ubuntu-22.04
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -148,6 +165,7 @@ jobs:
             package.json
             build/setup-release-combine.sh
           sparse-checkout-cone-mode: false
+          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target_branch || github.ref  }}
 
       - name: Download release metadata
         # only run this on "push" to "master" or alpha releases
@@ -169,7 +187,7 @@ jobs:
         if: ${{ env.SHOULD_PUBLISH == 'true' || env.SHOULD_PUBLISH_ALPHA == 'true' }}
         uses: ncipollo/release-action@v1
         with:
-          tag: v${{ needs.create_draft_release.outputs.version_tag }}
+          tag: v${{ needs.create_draft_release_if_needed.outputs.version_tag }}
           artifacts: 'dist/latest-linux.yml'
           allowUpdates: true
           omitNameDuringUpdate: true
@@ -179,14 +197,16 @@ jobs:
 
   build_windows:
     runs-on: windows-2022
-    needs: [create_draft_release]
+    needs: [create_draft_release_if_needed]
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - run: git config --global core.autocrlf false
 
       - name: Checkout git repo
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target_branch || github.ref  }}
 
       - name: Setup & Build
         uses: ./actions/setup_and_build
@@ -217,7 +237,7 @@ jobs:
   # We want both arm64 and intel mac builds, and according to this https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#supported-runners-and-hardware-resources macos-14 and above is always arm64 and macos-13 is the last intel runner
   # NOTE x64 builds made on an arm64 host will not bundle the native modules correctly https://github.com/electron-userland/electron-builder/issues/8646
   build_mac_arm64:
-    needs: [create_draft_release]
+    needs: [create_draft_release_if_needed]
     runs-on: macos-14
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -231,6 +251,8 @@ jobs:
 
       - name: Checkout git repo
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target_branch || github.ref  }}
 
       - name: Setup & Build
         uses: ./actions/setup_and_build
@@ -249,7 +271,7 @@ jobs:
 
   build_mac_x64:
     runs-on: macos-13
-    needs: [create_draft_release]
+    needs: [create_draft_release_if_needed]
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       MAC_CERTIFICATE: ${{ secrets.MAC_CERTIFICATE }}
@@ -262,6 +284,8 @@ jobs:
 
       - name: Checkout git repo
         uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target_branch || github.ref  }}
 
       - name: Setup & Build
         uses: ./actions/setup_and_build
@@ -279,7 +303,7 @@ jobs:
           should_publish: ${{ env.SHOULD_PUBLISH == 'true' || env.SHOULD_PUBLISH_ALPHA == 'true' }}
 
   post_build_mac:
-    needs: [build_mac_arm64, build_mac_x64]
+    needs: [create_draft_release_if_needed, build_mac_arm64, build_mac_x64]
     runs-on: ubuntu-22.04
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -294,6 +318,7 @@ jobs:
             package.json
             build/setup-release-combine.sh
           sparse-checkout-cone-mode: false
+          ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.target_branch || github.ref  }}
 
       - name: Download release metadata
         # only run this on "push" to "master" or alpha releases
@@ -315,7 +340,7 @@ jobs:
         if: ${{ env.SHOULD_PUBLISH == 'true' || env.SHOULD_PUBLISH_ALPHA == 'true' }}
         uses: ncipollo/release-action@v1
         with:
-          tag: v${{ needs.create_draft_release.outputs.version_tag }}
+          tag: v${{ needs.create_draft_release_if_needed.outputs.version_tag }}
           artifacts: 'dist/latest-mac.yml'
           allowUpdates: true
           omitNameDuringUpdate: true