Merge branch 'master' into patch-1

actix · Dec 29, 2024 · 70a7285 · 70a7285
2 parents a3e019a + 472dbca
commit 70a7285
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 34 deletions.
diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml
@@ -49,7 +49,7 @@ jobs:
           toolchain: ${{ matrix.version.version }}
 
       - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.45.6
+        uses: taiki-e/install-action@v2.46.20
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -83,7 +83,7 @@ jobs:
         uses: actions-rust-lang/[email protected]
 
       - name: Install just, cargo-hack
-        uses: taiki-e/install-action@v2.45.6
+        uses: taiki-e/install-action@v2.46.20
         with:
           tool: just,cargo-hack
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,7 +64,7 @@ jobs:
           toolchain: ${{ matrix.version.version }}
 
       - name: Install just, cargo-hack, cargo-nextest, cargo-ci-cache-clean
-        uses: taiki-e/install-action@v2.45.6
+        uses: taiki-e/install-action@v2.46.20
         with:
           tool: just,cargo-hack,cargo-nextest,cargo-ci-cache-clean
 
@@ -113,7 +113,7 @@ jobs:
           toolchain: nightly
 
       - name: Install just
-        uses: taiki-e/install-action@v2.45.6
+        uses: taiki-e/install-action@v2.46.20
         with:
           tool: just
 

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -24,15 +24,15 @@ jobs:
           components: llvm-tools
 
       - name: Install just, cargo-llvm-cov, cargo-nextest
-        uses: taiki-e/install-action@v2.45.6
+        uses: taiki-e/install-action@v2.46.20
         with:
           tool: just,cargo-llvm-cov,cargo-nextest
 
       - name: Generate code coverage
         run: just test-coverage-codecov
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v5.0.7
+        uses: codecov/codecov-action@v5.1.2
         with:
           files: codecov.json
           fail_ci_if_error: true

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -77,7 +77,7 @@ jobs:
           toolchain: ${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
 
       - name: Install just
-        uses: taiki-e/install-action@v2.45.6
+        uses: taiki-e/install-action@v2.46.20
         with:
           tool: just
 
@@ -88,30 +88,3 @@ jobs:
 
       - name: check external types
         run: just check-external-types-all +${{ vars.RUST_VERSION_EXTERNAL_TYPES }}
-
-  public-api-diff:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout main branch
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.base_ref }}
-
-      - name: Checkout PR branch
-        uses: actions/checkout@v4
-
-      - name: Install Rust (${{ vars.RUST_VERSION_API_DIFF }})
-        uses: actions-rust-lang/[email protected]
-        with:
-          toolchain: ${{ vars.RUST_VERSION_API_DIFF }}
-
-      - name: Install cargo-public-api
-        uses: taiki-e/[email protected]
-        with:
-          tool: cargo-public-api
-
-      - name: Generate API diff
-        run: |
-          for f in $(find -mindepth 2 -maxdepth 2 -name Cargo.toml); do
-            cargo public-api --manifest-path "$f" --simplified diff ${{ github.event.pull_request.base.sha }}..${{ github.sha }}
-          done