From 1a7d31d11ad01ffaa5fe89d0df25a22cb3144496 Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Sun, 23 May 2021 02:16:15 +0100 Subject: [PATCH 1/3] add rust-toolchain.toml --- .github/workflows/rust.yml | 7 ------- agb/rust-toolchain.toml | 3 +++ 2 files changed, 3 insertions(+), 7 deletions(-) create mode 100644 agb/rust-toolchain.toml diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index aef45787..1c645e2b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -22,13 +22,6 @@ jobs: sudo apt-get install libzip5 ./mGBA-0.9.0-ubuntu64-focal/libmgba.deb -y && \ rm -rf mgba.tar.xz mGBA-0.9.0-ubuntu64-focal - uses: actions/checkout@v2 - - name: Nightly rust with required components - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly-2021-04-20 - components: clippy, rust-src - override: true - - name: Cache uses: actions/cache@v2.1.1 with: diff --git a/agb/rust-toolchain.toml b/agb/rust-toolchain.toml new file mode 100644 index 00000000..87b54024 --- /dev/null +++ b/agb/rust-toolchain.toml @@ -0,0 +1,3 @@ +[toolchain] +channel = "nightly" +components = ["rust-src"] \ No newline at end of file From 9355ef3cc2c23acfd965814547bd2b5c2a663d30 Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Sun, 23 May 2021 02:20:32 +0100 Subject: [PATCH 2/3] add clippy component --- agb/rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agb/rust-toolchain.toml b/agb/rust-toolchain.toml index 87b54024..06842486 100644 --- a/agb/rust-toolchain.toml +++ b/agb/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] channel = "nightly" -components = ["rust-src"] \ No newline at end of file +components = ["rust-src", "clippy"] \ No newline at end of file From 373ec3390a569e9e5944281068c24a7802602403 Mon Sep 17 00:00:00 2001 From: Corwin Kuiper Date: Sun, 23 May 2021 02:25:08 +0100 Subject: [PATCH 3/3] remove unused environment variable --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1c645e2b..c1bf5378 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -29,7 +29,7 @@ jobs: ~/.cargo/registry ~/.cargo/git agb/target - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}-${{ steps.rust_install.outputs.rustc_hash }} + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - name: install mgba-test-runner run: cargo install --path mgba-test-runner