From 77e7cfe763ee588ff7407d5bec3d540086b40a65 Mon Sep 17 00:00:00 2001
From: Christian Clauss <cclauss@me.com>
Date: Fri, 26 Jan 2024 00:24:31 +0100
Subject: [PATCH] Remove deprecated actions-rs/toolchain (#1874)

---
 .github/workflows/ci.yaml      | 19 -------------------
 .github/workflows/release.yaml |  7 -------
 bin/package                    |  3 +++
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 35da974..03b75b4 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -22,12 +22,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Install Rust Toolchain Components
-      uses: actions-rs/toolchain@v1
-      with:
-        components: clippy, rustfmt
-        toolchain: stable
-
     - uses: Swatinem/rust-cache@v2
 
     - name: Clippy
@@ -59,12 +53,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Install Rust Toolchain Components
-      uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        toolchain: stable
-
     - uses: Swatinem/rust-cache@v2
 
     - name: Install `mdbook`
@@ -118,13 +106,6 @@ jobs:
         icacls C:\Windows\System32\bash.exe /grant administrators:F
         del C:\Windows\System32\bash.exe
 
-    - name: Install Rust Toolchain Components
-      uses: actions-rs/toolchain@v1
-      with:
-        components: clippy, rustfmt
-        override: true
-        toolchain: stable
-
     - uses: Swatinem/rust-cache@v2
 
     - name: Test
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 9fff990..7c29012 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -49,13 +49,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - name: Install Rust Toolchain Components
-      uses: actions-rs/toolchain@v1
-      with:
-        profile: minimal
-        target: ${{ matrix.target }}
-        toolchain: stable
-
     - name: Install AArch64 Toolchain
       if: ${{ matrix.target == 'aarch64-unknown-linux-musl' }}
       run: |
diff --git a/bin/package b/bin/package
index c855ddb..b273509 100755
--- a/bin/package
+++ b/bin/package
@@ -9,6 +9,9 @@ echo "Packaging just $VERSION for $TARGET..."
 
 test -f Cargo.lock || cargo generate-lockfile
 
+echo "Installing rust toolchain for $TARGET..."
+rustup target add $TARGET
+
 echo "Building just..."
 RUSTFLAGS="--deny warnings --codegen target-feature=+crt-static $TARGET_RUSTFLAGS" \
   cargo build --bin just --target $TARGET --release