From cc211ff871fedc3ebb987f6dd6ba91ebcc2b5cb4 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 28 Sep 2024 10:42:47 -0400 Subject: [PATCH 1/4] chore(dependabot): move rust-toolchain to toml format --- rust-toolchain | 1 - rust-toolchain.toml | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 rust-toolchain create mode 100644 rust-toolchain.toml diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index 902c741..0000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -1.65.0 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000..f8c2abb --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,2 @@ +[toolchain] +channel = "1.65.0" From a8b25178b197e4d66de66ff1c59e934617b39a46 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 28 Sep 2024 10:47:51 -0400 Subject: [PATCH 2/4] Update test.yaml --- .github/workflows/test.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 4c0ac58..48a3c70 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -22,10 +22,10 @@ jobs: ~/work/_temp/_github_home/.cargo/registry ~/work/_temp/_github_home/.cargo/git target - key: ${{ github.job }}-${{ hashFiles('rust-toolchain') }}-${{ hashFiles('**/Cargo.lock') }} + key: ${{ github.job }}-${{ hashFiles('rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }} restore-keys: | - ${{ github.job }}-${{ hashFiles('rust-toolchain') }}-${{ hashFiles('**/Cargo.lock') }} - ${{ github.job }}-${{ hashFiles('rust-toolchain') }}- + ${{ github.job }}-${{ hashFiles('rust-toolchain.toml') }}-${{ hashFiles('**/Cargo.lock') }} + ${{ github.job }}-${{ hashFiles('rust-toolchain.toml') }}- - name: Build uses: ./ci/github-actions/arch-run From 23eb20822eeadb31bdbe69dea0a5658b5bd78057 Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 28 Sep 2024 10:53:37 -0400 Subject: [PATCH 3/4] Update test.yaml --- .github/workflows/test.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 48a3c70..d04bb36 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -62,6 +62,7 @@ jobs: components: rustfmt override: 'true' default: 'true' + toolchain: 'rust-toolchain.toml' - name: Check code formatting run: cargo fmt -- --check From 9d782fcf819fedbd43a16c377d0e655ecb087e9a Mon Sep 17 00:00:00 2001 From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com> Date: Sat, 28 Sep 2024 11:33:29 -0400 Subject: [PATCH 4/4] Update test.yaml --- .github/workflows/test.yaml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index d04bb36..40c464c 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -56,13 +56,9 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions-rs/toolchain@v1.0.7 + - uses: dtolnay/rust-toolchain@stable with: - profile: minimal components: rustfmt - override: 'true' - default: 'true' - toolchain: 'rust-toolchain.toml' - name: Check code formatting run: cargo fmt -- --check