From fea5cd257413b1f7e62e88fa964a8d019f36715c Mon Sep 17 00:00:00 2001
From: Salman Mohammed <smohammed@squareup.com>
Date: Fri, 17 Jan 2025 11:49:59 -0500
Subject: [PATCH] try using dtolnay/rust-toolchain@stable to setup rust

---
 .github/workflows/build-cli.yml | 15 +++++++--------
 .github/workflows/canary.yml    |  6 +++---
 .github/workflows/release.yml   |  8 ++++----
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml
index 7f882f798b..9f812d959f 100644
--- a/.github/workflows/build-cli.yml
+++ b/.github/workflows/build-cli.yml
@@ -28,26 +28,26 @@ jobs:
       matrix:
         os: ${{ fromJson(inputs.operating-systems) }}
         architecture: ${{ fromJson(inputs.architectures) }}
-
         include:
-          # These are the standard two OSes & suffixes you originally had:
           - os: ubuntu-latest
             target-suffix: unknown-linux-gnu
-            # If you want: define additional custom fields here as needed
           - os: macos-latest
             target-suffix: apple-darwin
 
     steps:
-      - name: Checkout
+      - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Setup Rust 
+        uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
           target: ${{ matrix.architecture }}-${{ matrix.target-suffix }}
 
-      - name: Build CLI with cross
+      - name: Install cross
+        run: cargo install cross --git https://github.com/cross-rs/cross
+
+      - name: Build CLI
         env:
           CROSS_NO_WARNINGS: 0
         run: |
@@ -55,7 +55,6 @@ jobs:
           rustup target add "${TARGET}"
 
           # 'cross' is used to cross-compile for different architectures (see Cross.toml)
-          cargo install cross --git https://github.com/cross-rs/cross
           cross build --release --target ${TARGET} -p goose-cli
 
           # tar the goose binary as goose-<TARGET>.tar.bz2
diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml
index efd4cc036e..18bab669c9 100644
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@@ -33,8 +33,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/upload-artifact@v4
         with:
-          name: install-cli.sh
-          path: install-cli.sh
+          name: download_cli.sh
+          path: download_cli.sh
 
   # ------------------------------------------------------------
   # 3) Bundle Desktop App (macOS only) - builds goosed and Electron app
@@ -74,7 +74,7 @@ jobs:
           artifacts: |
             goose-*.tar.bz2
             Goose*.zip
-            install-cli.sh
+            download_cli.sh
           allowUpdates: true
           omitBody: true
           omitPrereleaseDuringUpdate: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a0bc94ba96..b5b972432a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -29,8 +29,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/upload-artifact@v4
         with:
-          name: install-cli.sh
-          path: install-cli.sh
+          name: download_cli.sh
+          path: download_cli.sh
   
   # ------------------------------------------------------------
   # 3) Bundle Desktop App (macOS only) - builds goosed and Electron app
@@ -69,7 +69,7 @@ jobs:
           artifacts: |
             goose-*.tar.bz2
             Goose*.zip
-            install-cli.sh
+            download_cli.sh
           allowUpdates: true
           omitBody: true
           omitPrereleaseDuringUpdate: true
@@ -86,7 +86,7 @@ jobs:
           artifacts: |
             goose-*.tar.bz2
             Goose*.zip
-            install-cli.sh
+            download_cli.sh
           allowUpdates: true
           omitBody: true
           omitPrereleaseDuringUpdate: true