chore: merge dev workflow with master

Author: Bilb

.github/workflows/build-binaries.yml

@@ -23,14 +23,18 @@ on:
         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 }}
   cancel-in-progress: true
 
 env:
   # we only want to publish on "push to master" or alpha releases. When we don't want to publish, we want to upload artefacts
   SHOULD_PUBLISH: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master'}}
-  SHOULD_PUBLISH_ALPHA: ${{((github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release') && contains(github.ref, '-alpha.'))) || (github.event_name == 'workflow_dispatch') }}
+  SHOULD_PUBLISH_ALPHA: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/heads/release') && contains(github.ref, '-alpha.') }}
 
 jobs:
   create_draft_release_if_needed:
@@ -75,6 +79,7 @@ jobs:
 
   build_linux:
     runs-on: ubuntu-22.04
+    needs: [create_draft_release_if_needed]
     strategy:
       fail-fast: false
       matrix:
@@ -159,19 +164,9 @@ jobs:
           sparse-checkout: |
             package.json
             build/setup-release-combine.sh
-            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
-        # only run this on "push" to "master" or alpha releases
-        if: ${{ env.SHOULD_PUBLISH == 'true' || env.SHOULD_PUBLISH_ALPHA == 'true' }}
-        run: |
-          version=$(node -p "require('./package.json').version")
-          echo "VERSION_TAG=$version" >> "$GITHUB_OUTPUT"
-
       - name: Download release metadata
         # only run this on "push" to "master" or alpha releases
         if: ${{ env.SHOULD_PUBLISH == 'true' || env.SHOULD_PUBLISH_ALPHA == 'true' }}
@@ -192,10 +187,7 @@ jobs:
         if: ${{ env.SHOULD_PUBLISH == 'true' || env.SHOULD_PUBLISH_ALPHA == 'true' }}
         uses: ncipollo/release-action@v1
         with:
-          tag: v${{ steps.get_version.outputs.VERSION_TAG }}
-          name: 'Session ${{ steps.get_version.outputs.VERSION_TAG }}'
-          draft: true
-          bodyFile: ${{ env.SHOULD_PUBLISH_ALPHA == 'true' && 'build/release-notes-alpha.md' || 'build/release-notes.md' }}
+          tag: v${{ needs.create_draft_release_if_needed.outputs.version_tag }}
           artifacts: 'dist/latest-linux.yml'
           allowUpdates: true
           omitNameDuringUpdate: true
@@ -205,6 +197,7 @@ jobs:
 
   build_windows:
     runs-on: windows-2022
+    needs: [create_draft_release_if_needed]
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
@@ -244,6 +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_if_needed]
     runs-on: macos-14
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -277,6 +271,7 @@ jobs:
 
   build_mac_x64:
     runs-on: macos-13
+    needs: [create_draft_release_if_needed]
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       MAC_CERTIFICATE: ${{ secrets.MAC_CERTIFICATE }}
@@ -310,12 +305,14 @@ jobs:
   post_build_mac:
     needs: [build_mac_arm64, build_mac_x64]
     runs-on: ubuntu-22.04
+    env:
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
     steps:
       - name: Checkout git repo
         # only run this on "push" to "master" or alpha releases
         if: ${{ env.SHOULD_PUBLISH == 'true' || env.SHOULD_PUBLISH_ALPHA == 'true' }}
         uses: actions/checkout@v4
-        # We only need the package.json file in this run (to extract the version being built)
+        # We only need a few files in this run, no point cloning everything
         with:
           sparse-checkout: |
             package.json
@@ -343,10 +340,7 @@ jobs:
         if: ${{ env.SHOULD_PUBLISH == 'true' || env.SHOULD_PUBLISH_ALPHA == 'true' }}
         uses: ncipollo/release-action@v1
         with:
-          tag: v${{ steps.get_version.outputs.VERSION_TAG }}
-          name: 'Session ${{ steps.get_version.outputs.VERSION_TAG }}'
-          draft: true
-          bodyFile: ${{ env.SHOULD_PUBLISH_ALPHA == 'true' && 'build/release-notes-alpha.md' || 'build/release-notes.md' }}
+          tag: v${{ needs.create_draft_release_if_needed.outputs.version_tag }}
           artifacts: 'dist/latest-mac.yml'
           allowUpdates: true
           omitBodyDuringUpdate: true