Skip to content

Commit 47bda4c

Browse files
liuzsenliuzsen
authored
Merge branch 'actix:main' into master
2 parents 6e46f33 + 6c0a14a commit 47bda4c

File tree

45 files changed

+2635
-139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2635
-139
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: CI (post-merge)
22

33
on:
4-
push: { branches: [master] }
4+
push: { branches: [main] }
55

66
permissions: { contents: read }
77

@@ -31,12 +31,12 @@ jobs:
3131
- uses: actions/checkout@v5
3232

3333
- name: Install Rust (nightly)
34-
uses: actions-rust-lang/setup-rust-toolchain@v1.14.1
34+
uses: actions-rust-lang/setup-rust-toolchain@v1.15.2
3535
with:
3636
toolchain: nightly
3737

3838
- name: Install cargo-hack, cargo-ci-cache-clean
39-
uses: taiki-e/install-action@v2.58.30
39+
uses: taiki-e/install-action@v2.62.46
4040
with:
4141
tool: cargo-hack,cargo-ci-cache-clean
4242

@@ -81,12 +81,12 @@ jobs:
8181
echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV
8282
8383
- name: Install Rust (nightly)
84-
uses: actions-rust-lang/setup-rust-toolchain@v1.14.1
84+
uses: actions-rust-lang/setup-rust-toolchain@v1.15.2
8585
with:
8686
toolchain: nightly
8787

8888
- name: Install cargo-hack and cargo-ci-cache-clean
89-
uses: taiki-e/install-action@v2.58.30
89+
uses: taiki-e/install-action@v2.62.46
9090
with:
9191
tool: cargo-hack,cargo-ci-cache-clean
9292

‎.github/workflows/ci.yml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
merge_group:
77
types: [checks_requested]
88
push:
9-
branches: [master]
9+
branches: [main]
1010

1111
permissions: { contents: read }
1212

@@ -22,7 +22,7 @@ jobs:
2222
target:
2323
- { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
2424
version:
25-
- { name: msrv, version: 1.80.0 }
25+
- { name: msrv, version: 1.82.0 }
2626
- { name: stable, version: stable }
2727

2828
name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
@@ -44,19 +44,23 @@ jobs:
4444
- uses: actions/checkout@v5
4545

4646
- name: Install Rust (${{ matrix.version.name }})
47-
uses: actions-rust-lang/setup-rust-toolchain@v1.14.1
47+
uses: actions-rust-lang/setup-rust-toolchain@v1.15.2
4848
with:
4949
toolchain: ${{ matrix.version.version }}
5050

5151
- name: Install cargo-hack and cargo-ci-cache-clean, just
52-
uses: taiki-e/install-action@v2.58.30
52+
uses: taiki-e/install-action@v2.62.46
5353
with:
5454
tool: cargo-hack,cargo-ci-cache-clean,just
5555

5656
- name: workaround MSRV issues
5757
if: matrix.version.name == 'msrv'
5858
run: just downgrade-for-msrv
5959

60+
- name: deny check
61+
if: matrix.version.name == 'stable' && matrix.target.os == 'ubuntu-latest'
62+
uses: EmbarkStudios/cargo-deny-action@f2ba7abc2abebaf185c833c3961145a3c275caad # v2.0.13
63+
6064
- name: check minimal
6165
run: cargo ci-min
6266

@@ -82,7 +86,7 @@ jobs:
8286
- { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
8387
- { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
8488
version:
85-
- { name: msrv, version: 1.80.0 }
89+
- { name: msrv, version: 1.82.0 }
8690
- { name: stable, version: stable }
8791

8892
name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
@@ -101,12 +105,12 @@ jobs:
101105
echo "RUSTFLAGS=-C target-feature=+crt-static" >> $GITHUB_ENV
102106
103107
- name: Install Rust (${{ matrix.version.name }})
104-
uses: actions-rust-lang/setup-rust-toolchain@v1.14.1
108+
uses: actions-rust-lang/setup-rust-toolchain@v1.15.2
105109
with:
106110
toolchain: ${{ matrix.version.version }}
107111

108112
- name: Install cargo-hack, cargo-ci-cache-clean, just
109-
uses: taiki-e/install-action@v2.58.30
113+
uses: taiki-e/install-action@v2.62.46
110114
with:
111115
tool: cargo-hack,cargo-ci-cache-clean,just
112116

@@ -137,12 +141,12 @@ jobs:
137141
- uses: actions/checkout@v5
138142

139143
- name: Install Rust (nightly)
140-
uses: actions-rust-lang/setup-rust-toolchain@v1.14.1
144+
uses: actions-rust-lang/setup-rust-toolchain@v1.15.2
141145
with:
142146
toolchain: nightly
143147

144148
- name: Install just
145-
uses: taiki-e/install-action@v2.58.30
149+
uses: taiki-e/install-action@v2.62.46
146150
with:
147151
tool: just
148152

‎.github/workflows/coverage.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Coverage
22

33
on:
44
push:
5-
branches: [master]
5+
branches: [main]
66

77
permissions: { contents: read }
88

@@ -25,21 +25,21 @@ jobs:
2525
- uses: actions/checkout@v5
2626

2727
- name: Install Rust
28-
uses: actions-rust-lang/setup-rust-toolchain@v1.14.1
28+
uses: actions-rust-lang/setup-rust-toolchain@v1.15.2
2929
with:
3030
toolchain: nightly
3131
components: llvm-tools-preview
3232

3333
- name: Install just, cargo-llvm-cov, cargo-nextest
34-
uses: taiki-e/install-action@v2.58.30
34+
uses: taiki-e/install-action@v2.62.46
3535
with:
3636
tool: just,cargo-llvm-cov,cargo-nextest
3737

3838
- name: Generate code coverage
3939
run: just test-coverage-codecov
4040

4141
- name: Upload to Codecov
42-
uses: codecov/[email protected].0
42+
uses: codecov/[email protected].1
4343
with:
4444
files: codecov.json
4545
fail_ci_if_error: true

‎.github/workflows/lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v5
1717

1818
- name: Install Rust (nightly)
19-
uses: actions-rust-lang/setup-rust-toolchain@v1.14.1
19+
uses: actions-rust-lang/setup-rust-toolchain@v1.15.2
2020
with:
2121
toolchain: nightly
2222
components: rustfmt
@@ -34,7 +34,7 @@ jobs:
3434
- uses: actions/checkout@v5
3535

3636
- name: Install Rust
37-
uses: actions-rust-lang/setup-rust-toolchain@v1.14.1
37+
uses: actions-rust-lang/setup-rust-toolchain@v1.15.2
3838
with:
3939
components: clippy
4040

0 commit comments

Comments
 (0)