chore: ignore Cargo.lock and bump toolchain (#46)

Signed-off-by: MrCroxx <[email protected]>
foyer-rs · Jul 4, 2023 · f1a3bbf · f1a3bbf
1 parent 37031fe
commit f1a3bbf
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 1,865 deletions.
diff --git a/.github/template/template.yml b/.github/template/template.yml
@@ -3,10 +3,9 @@ name:
 on:
 
 env:
-  RUST_TOOLCHAIN: nightly-2023-04-07
+  RUST_TOOLCHAIN: nightly-2023-05-31
   CARGO_TERM_COLOR: always
-  CACHE_KEY_SUFFIX: 20230518
-  RUNKV_CI: true
+  CACHE_KEY_SUFFIX: 20230703
 
 jobs:
   misc-check:
@@ -47,7 +46,7 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}-${{ env.CACHE_KEY_SUFFIX }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}-${{ env.CACHE_KEY_SUFFIX }}
       - name: Install cargo-sort
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -60,8 +59,9 @@ jobs:
           cargo fmt --all -- --check
       - name: Run rust clippy check
         run: |
-          # If new CI checks are added, the one with `--locked` must be run first.
-          cargo clippy --all-targets --locked -- -D warnings
+          cargo clippy --all-targets --features tokio-console -- -D warnings &&
+          cargo clippy --all-targets --features deadlock -- -D warnings &&
+          cargo clippy --all-targets -- -D warnings
       - if: steps.cache.outputs.cache-hit != 'true'
         uses: taiki-e/install-action@cargo-llvm-cov
       - if: steps.cache.outputs.cache-hit != 'true'
@@ -90,7 +90,7 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-asan-${{ hashFiles('**/Cargo.lock') }}-${{ env.CACHE_KEY_SUFFIX }}
+          key: ${{ runner.os }}-cargo-asan-${{ hashFiles('**/Cargo.toml') }}-${{ env.CACHE_KEY_SUFFIX }}
       - name: Run foyer-storage-bench with single worker thread and deadlock detection
         env:
           RUST_BACKTRACE: 1
@@ -121,7 +121,7 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-asan-${{ hashFiles('**/Cargo.lock') }}-${{ env.CACHE_KEY_SUFFIX }}
+          key: ${{ runner.os }}-cargo-asan-${{ hashFiles('**/Cargo.toml') }}-${{ env.CACHE_KEY_SUFFIX }}
       - name: Run foyer-storage-bench With Address Sanitizer
         env:
           RUST_BACKTRACE: 1

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -11,10 +11,9 @@ on:
     branches: [main]
   workflow_dispatch:
 env:
-  RUST_TOOLCHAIN: nightly-2023-04-07
+  RUST_TOOLCHAIN: nightly-2023-05-31
   CARGO_TERM_COLOR: always
-  CACHE_KEY_SUFFIX: 20230518
-  RUNKV_CI: true
+  CACHE_KEY_SUFFIX: 20230703
 jobs:
   misc-check:
     name: misc check
@@ -54,7 +53,7 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}-${{ env.CACHE_KEY_SUFFIX }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}-${{ env.CACHE_KEY_SUFFIX }}
       - name: Install cargo-sort
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -67,8 +66,9 @@ jobs:
           cargo fmt --all -- --check
       - name: Run rust clippy check
         run: |
-          # If new CI checks are added, the one with `--locked` must be run first.
-          cargo clippy --all-targets --locked -- -D warnings
+          cargo clippy --all-targets --features tokio-console -- -D warnings &&
+          cargo clippy --all-targets --features deadlock -- -D warnings &&
+          cargo clippy --all-targets -- -D warnings
       - if: steps.cache.outputs.cache-hit != 'true'
         uses: taiki-e/install-action@cargo-llvm-cov
       - if: steps.cache.outputs.cache-hit != 'true'
@@ -96,7 +96,7 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-asan-${{ hashFiles('**/Cargo.lock') }}-${{ env.CACHE_KEY_SUFFIX }}
+          key: ${{ runner.os }}-cargo-asan-${{ hashFiles('**/Cargo.toml') }}-${{ env.CACHE_KEY_SUFFIX }}
       - name: Run foyer-storage-bench with single worker thread and deadlock detection
         env:
           RUST_BACKTRACE: 1
@@ -126,7 +126,7 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-asan-${{ hashFiles('**/Cargo.lock') }}-${{ env.CACHE_KEY_SUFFIX }}
+          key: ${{ runner.os }}-cargo-asan-${{ hashFiles('**/Cargo.toml') }}-${{ env.CACHE_KEY_SUFFIX }}
       - name: Run foyer-storage-bench With Address Sanitizer
         env:
           RUST_BACKTRACE: 1

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -10,10 +10,9 @@ on:
   pull_request:
     branches: [main]
 env:
-  RUST_TOOLCHAIN: nightly-2023-04-07
+  RUST_TOOLCHAIN: nightly-2023-05-31
   CARGO_TERM_COLOR: always
-  CACHE_KEY_SUFFIX: 20230518
-  RUNKV_CI: true
+  CACHE_KEY_SUFFIX: 20230703
 jobs:
   misc-check:
     name: misc check
@@ -53,7 +52,7 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}-${{ env.CACHE_KEY_SUFFIX }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml') }}-${{ env.CACHE_KEY_SUFFIX }}
       - name: Install cargo-sort
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -66,8 +65,9 @@ jobs:
           cargo fmt --all -- --check
       - name: Run rust clippy check
         run: |
-          # If new CI checks are added, the one with `--locked` must be run first.
-          cargo clippy --all-targets --locked -- -D warnings
+          cargo clippy --all-targets --features tokio-console -- -D warnings &&
+          cargo clippy --all-targets --features deadlock -- -D warnings &&
+          cargo clippy --all-targets -- -D warnings
       - if: steps.cache.outputs.cache-hit != 'true'
         uses: taiki-e/install-action@cargo-llvm-cov
       - if: steps.cache.outputs.cache-hit != 'true'
@@ -95,7 +95,7 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-asan-${{ hashFiles('**/Cargo.lock') }}-${{ env.CACHE_KEY_SUFFIX }}
+          key: ${{ runner.os }}-cargo-asan-${{ hashFiles('**/Cargo.toml') }}-${{ env.CACHE_KEY_SUFFIX }}
       - name: Run foyer-storage-bench with single worker thread and deadlock detection
         env:
           RUST_BACKTRACE: 1
@@ -125,7 +125,7 @@ jobs:
             ~/.cargo/registry/index/
             ~/.cargo/registry/cache/
             ~/.cargo/git/db/
-          key: ${{ runner.os }}-cargo-asan-${{ hashFiles('**/Cargo.lock') }}-${{ env.CACHE_KEY_SUFFIX }}
+          key: ${{ runner.os }}-cargo-asan-${{ hashFiles('**/Cargo.toml') }}-${{ env.CACHE_KEY_SUFFIX }}
       - name: Run foyer-storage-bench With Address Sanitizer
         env:
           RUST_BACKTRACE: 1

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 /.vscode
 
 /target
+
+Cargo.lock