From f6880688b2f3d0a62a2ea0bf30e962c931a35f51 Mon Sep 17 00:00:00 2001
From: Salman Mohammed <smohammed@squareup.com>
Date: Fri, 17 Jan 2025 11:19:58 -0500
Subject: [PATCH] reuseable workflows need to be at root, install-cli artifact

---
 .github/workflows/{reuseable => }/bundle-desktop.yml | 4 ++--
 .github/workflows/canary.yml                         | 3 ++-
 .github/workflows/pr-comment-bundle-desktop.yml      | 4 +++-
 .github/workflows/release.yml                        | 4 +++-
 4 files changed, 10 insertions(+), 5 deletions(-)
 rename .github/workflows/{reuseable => }/bundle-desktop.yml (96%)

diff --git a/.github/workflows/reuseable/bundle-desktop.yml b/.github/workflows/bundle-desktop.yml
similarity index 96%
rename from .github/workflows/reuseable/bundle-desktop.yml
rename to .github/workflows/bundle-desktop.yml
index be5385ad2..9c0b4d656 100644
--- a/.github/workflows/reuseable/bundle-desktop.yml
+++ b/.github/workflows/bundle-desktop.yml
@@ -1,5 +1,5 @@
-# This is a reuseable workflow that bundles the Desktop App for macOS.
-# This gets used in:
+# This is a **reuseable** workflow that bundles the Desktop App for macOS.
+# It doesn't get triggered on its own. It gets used in multiple workflows:
 #  - release.yml
 #  - canary.yml
 #  - pr-comment-bundle-desktop.yml
diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
index 5ba076680..7bcd66fb1 100644
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -85,7 +85,7 @@ jobs:
   # 3) Bundle Desktop App (macOS only) - builds goosed and Electron app
   # ------------------------------------------------------------
   bundle-desktop:
-    uses: ./.github/workflows/reuseable/bundle-desktop.yml
+    uses: ./.github/workflows/bundle-desktop.yml
     secrets:
       CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }}
       CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
@@ -119,6 +119,7 @@ jobs:
           artifacts: |
             goose-*.tar.bz2
             Goose*.zip
+            install-cli.sh
           allowUpdates: true
           omitBody: true
           omitPrereleaseDuringUpdate: true
diff --git a/.github/workflows/pr-comment-bundle-desktop.yml b/.github/workflows/pr-comment-bundle-desktop.yml
index ec57a9bcb..3b5f90a58 100644
--- a/.github/workflows/pr-comment-bundle-desktop.yml
+++ b/.github/workflows/pr-comment-bundle-desktop.yml
@@ -30,7 +30,9 @@ jobs:
           allowed_contexts: pull_request
 
   bundle-desktop:
-    uses: ./.github/workflows/reuseable/bundle-desktop.yml
+    # Only run this if "/bundle-desktop" command is detected.
+    if: ${{ steps.command.outputs.continue == 'true' }}
+    uses: ./.github/workflows/bundle-desktop.yml
     secrets:
       CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }}
       CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a484fb9b4..485940aee 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -81,7 +81,7 @@ jobs:
   # 3) Bundle Desktop App (macOS only) - builds goosed and Electron app
   # ------------------------------------------------------------
   bundle-desktop:
-    uses: ./.github/workflows/reuseable/bundle-desktop.yml
+    uses: ./.github/workflows/bundle-desktop.yml
     secrets:
       CERTIFICATE_OSX_APPLICATION: ${{ secrets.CERTIFICATE_OSX_APPLICATION }}
       CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
@@ -114,6 +114,7 @@ jobs:
           artifacts: |
             goose-*.tar.bz2
             Goose*.zip
+            install-cli.sh
           allowUpdates: true
           omitBody: true
           omitPrereleaseDuringUpdate: true
@@ -130,6 +131,7 @@ jobs:
           artifacts: |
             goose-*.tar.bz2
             Goose*.zip
+            install-cli.sh
           allowUpdates: true
           omitBody: true
           omitPrereleaseDuringUpdate: true