summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Clauss <cclauss@me.com>2024-01-26 00:24:31 +0100
committerGitHub <noreply@github.com>2024-01-25 15:24:31 -0800
commit77e7cfe763ee588ff7407d5bec3d540086b40a65 (patch)
treee80983ecb3b85e882f025f250c5fb396c9c8fb36
parenteb8227744eaf574a36a90d89e429ee6a488978b1 (diff)
Remove deprecated actions-rs/toolchain (#1874)
-rw-r--r--.github/workflows/ci.yaml19
-rw-r--r--.github/workflows/release.yaml7
-rwxr-xr-xbin/package3
3 files changed, 3 insertions, 26 deletions
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 35da974e..03b75b40 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 9fff9902..7c290126 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 c855ddbf..b273509b 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