From 54fa1ad6ec7adb0d9c14076843ef5e51c18ecc7a Mon Sep 17 00:00:00 2001 From: Fabian Boehm Date: Fri, 14 Jul 2023 21:36:43 +0200 Subject: [PATCH] Revert "Try to move rust CI back to 1.70" Should *hopefully* be fixed by deleting the cache at https://github.com/fish-shell/fish-shell/actions/caches. This reverts commit 5c29ff52fb76ad360c2e1078289f4a30022875d5. --- .github/workflows/rust_checks.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/rust_checks.yml b/.github/workflows/rust_checks.yml index 4e17faaed..bb474891f 100644 --- a/.github/workflows/rust_checks.yml +++ b/.github/workflows/rust_checks.yml @@ -14,13 +14,9 @@ jobs: - name: SetupRust uses: ATiltedTree/setup-rust@v1 with: - # FIXME: We want "stable" here, but 1.71 isn't working - # DATE: 2023-07-14 - rust-version: "1.70" + rust-version: stable - name: cargo fmt run: | - # Hack: setup-rust seems to fail to install this? - rustup component add rustfmt cd fish-rust cargo fmt --check --all @@ -32,9 +28,7 @@ jobs: - name: SetupRust uses: ATiltedTree/setup-rust@v1 with: - # FIXME: We want "stable" here, but 1.71 isn't working - # DATE: 2023-07-14 - rust-version: "1.70" + rust-version: stable - name: Install deps run: | sudo apt install gettext libncurses5-dev libpcre2-dev python3-pip tmux @@ -44,7 +38,5 @@ jobs: cmake -B build - name: cargo clippy run: | - # Hack: setup-rust seems to fail to install this? - rustup component add clippy cd fish-rust cargo clippy --workspace --all-targets -- --deny=warnings