From e1d821bf45a39c3e755a8ae84071ff060d1e9dec Mon Sep 17 00:00:00 2001 From: Hana Date: Sat, 2 Jul 2022 01:01:29 +0800 Subject: [PATCH 1/3] chore: upgrade toolchain to 1.62.0 --- rust-toolchain | 1 - rust-toolchain.toml | 4 ++++ 2 files changed, 4 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 c7898c23f248..000000000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -nightly-2022-06-12 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 000000000000..417dc4fb49e0 --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy. +# https://rust-lang.github.io/rustup/concepts/profiles.html +profile = "default" +channel = "1.62.0" From 662e7ef64a9494139b73d27a876ebea8c3b3d520 Mon Sep 17 00:00:00 2001 From: Hana Date: Sat, 2 Jul 2022 01:02:11 +0800 Subject: [PATCH 2/3] Delete rust-toolchain.toml --- rust-toolchain.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 417dc4fb49e0..7f65710a4abb 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,4 +1,3 @@ -# The default profile includes rustc, rust-std, cargo, rust-docs, rustfmt and clippy. -# https://rust-lang.github.io/rustup/concepts/profiles.html +[toolchain] profile = "default" channel = "1.62.0" From d354a8944a572af2114a9f069e80317db5f5f4ad Mon Sep 17 00:00:00 2001 From: hardfist Date: Fri, 8 Jul 2022 13:34:35 +0800 Subject: [PATCH 3/3] chore: remove toolchain action --- .github/workflows/test.yaml | 7 ++----- .husky/pre-commit | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 6fd4e1476633..94a766cb6c08 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -21,15 +21,12 @@ jobs: timeout-minutes: 30 steps: - uses: actions/checkout@v2 + - name: Install toolchain + run: rustup show # - name: Install yarn # run: npm install -g yarn # - name: yarn install --no-immutable # run: npm run init - - name: Install - uses: actions-rs/toolchain@v1 - with: - profile: minimal - override: true # - name: Configure cache # uses: actions/cache@v2 # with: diff --git a/.husky/pre-commit b/.husky/pre-commit index fab6428a1a72..d2ae35e84b09 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1,4 @@ #!/bin/sh . "$(dirname "$0")/_/husky.sh" -pnpm lint-staged +yarn lint-staged