Skip to content

Commit 0f18c72

Browse files
Merge branch 'master' into headermap2
2 parents 63137d9 + c1f88f7 commit 0f18c72

File tree

4 files changed

+24
-16
lines changed

4 files changed

+24
-16
lines changed

.github/workflows/ci-post-merge.yml

+10-7
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
toolchain: ${{ matrix.version.version }}
4646

4747
- name: Install cargo-hack
48-
uses: taiki-e/install-action@v2.25.9
48+
uses: taiki-e/install-action@v2.26.8
4949
with:
5050
tool: cargo-hack
5151

@@ -69,10 +69,13 @@ jobs:
6969
cargo test --lib --tests -p=actix-multipart --all-features
7070
cargo test --lib --tests -p=actix-web-actors --all-features
7171
72-
- name: Clear the cargo caches
73-
run: |
74-
cargo --locked install cargo-cache --version 0.8.3 --no-default-features --features ci-autoclean
75-
cargo-cache
72+
- name: Install cargo-ci-cache-clean
73+
uses: taiki-e/[email protected]
74+
with:
75+
tool: cargo-ci-cache-clean
76+
77+
- name: CI cache clean
78+
run: cargo-ci-cache-clean
7679

7780
ci_feature_powerset_check:
7881
name: Verify Feature Combinations
@@ -85,7 +88,7 @@ jobs:
8588
uses: actions-rust-lang/[email protected]
8689

8790
- name: Install cargo-hack
88-
uses: taiki-e/install-action@v2.25.9
91+
uses: taiki-e/install-action@v2.26.8
8992
with:
9093
tool: cargo-hack
9194

@@ -106,7 +109,7 @@ jobs:
106109
uses: actions-rust-lang/[email protected]
107110

108111
- name: Install nextest
109-
uses: taiki-e/install-action@v2.25.9
112+
uses: taiki-e/install-action@v2.26.8
110113
with:
111114
tool: nextest
112115

.github/workflows/ci.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
- name: Install OpenSSL
3939
if: matrix.target.os == 'windows-latest'
40-
run: choco install openssl -y --forcex64 --no-progress
40+
run: choco install openssl -y --forcex64 --no-progress --version=3.2.1
4141
- name: Set OpenSSL dir in env
4242
if: matrix.target.os == 'windows-latest'
4343
run: |
@@ -50,7 +50,7 @@ jobs:
5050
toolchain: ${{ matrix.version.version }}
5151

5252
- name: Install cargo-hack
53-
uses: taiki-e/install-action@v2.25.9
53+
uses: taiki-e/install-action@v2.26.8
5454
with:
5555
tool: cargo-hack
5656

@@ -83,10 +83,13 @@ jobs:
8383
cargo test --lib --tests -p=actix-multipart --all-features
8484
cargo test --lib --tests -p=actix-web-actors --all-features
8585
86-
- name: Clear the cargo caches
87-
run: |
88-
cargo --locked install cargo-cache --version 0.8.3 --no-default-features --features ci-autoclean
89-
cargo-cache
86+
- name: Install cargo-ci-cache-clean
87+
uses: taiki-e/[email protected]
88+
with:
89+
tool: cargo-ci-cache-clean
90+
91+
- name: CI cache clean
92+
run: cargo-ci-cache-clean
9093

9194
io-uring:
9295
name: io-uring tests

.github/workflows/coverage.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,17 @@ jobs:
2323
components: llvm-tools-preview
2424

2525
- name: Install cargo-llvm-cov
26-
uses: taiki-e/install-action@v2.25.9
26+
uses: taiki-e/install-action@v2.26.8
2727
with:
2828
tool: cargo-llvm-cov
2929

3030
- name: Generate code coverage
3131
run: cargo llvm-cov --workspace --all-features --codecov --output-path codecov.json
3232

3333
- name: Upload coverage to Codecov
34-
uses: codecov/codecov-action@v3.1.4
34+
uses: codecov/codecov-action@v4.0.0
3535
with:
3636
files: codecov.json
3737
fail_ci_if_error: true
38+
env:
39+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ jobs:
8282
toolchain: nightly-2023-08-25
8383

8484
- name: Install cargo-public-api
85-
uses: taiki-e/install-action@v2.24.1
85+
uses: taiki-e/install-action@v2.26.8
8686
with:
8787
tool: cargo-public-api
8888

0 commit comments

Comments
 (0)