reuseable workflows need to be at root, install-cli artifact

block · Jan 17, 2025 · f688068 · f688068
1 parent 7210643
commit f688068
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/...ub/workflows/reuseable/bundle-desktop.yml → .github/workflows/bundle-desktop.yml b/...ub/workflows/reuseable/bundle-desktop.yml → .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
@@ -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
@@ -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
@@ -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