Combine remaining workflows

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>

.github/workflows/release.yml

@@ -29,22 +29,9 @@ jobs:
             gpg-fingerprint: ${{ vars.GPG_FINGERPRINT }}
             asset-path: dist/*.tar.gz
             expected-asset-count: 3
+            # Desktop has no dist script so we only target web here
             dir: apps/web
 
-    notify-downstream:
-        name: Trigger release drafter downstream
-        needs: release
-        runs-on: ubuntu-24.04
-        steps:
-            - name: Notify element-desktop repo that element-web release has completed to re-trigger release-drafter
-              uses: benc-uk/workflow-dispatch@7a027648b88c2413826b6ddd6c76114894dc5ec4 # v1
-              with:
-                  workflow: release-drafter.yml
-                  repo: element-hq/element-desktop
-                  ref: staging
-                  # Required when using the `repo` option. Either a PAT or a token generated from the GitHub app or CLI
-                  token: "${{ secrets.ELEMENT_BOT_TOKEN }}"
-
     check:
         name: Post release checks
         needs: release
@@ -69,3 +56,12 @@ jobs:
                   wait-interval: 10
                   check-name: Build package
                   allowed-conclusions: success
+
+            - name: Wait for desktop packaging
+              uses: t3chguy/wait-on-check-action@18541021811b56544d90e0f073401c2b99e249d6 # fork
+              with:
+                  ref: master
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+                  wait-interval: 10
+                  check-regexp: Prepare|Linux|macOS|Windows|Deploy|deploy
+                  allowed-conclusions: success