Skip to content

Commit 2365a6b

Browse files
GreeFineGreeFine
committed
Merge remote-tracking branch 'upstream/master'
2 parents 87ec5b4 + 4bad825 commit 2365a6b

File tree

42 files changed

+370
-345
lines changed

Some content is hidden

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

42 files changed

+370
-345
lines changed

‎.github/ISSUE_TEMPLATE/config.yml

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎.github/dependabot.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: cargo
4+
directory: /
5+
schedule:
6+
interval: weekly
7+
- package-ecosystem: github-actions
8+
directory: /
9+
schedule:
10+
interval: weekly

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

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ jobs:
1616
matrix:
1717
target:
1818
- { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
19-
version:
20-
- nightly
2119

22-
name: ${{ matrix.target.name }} / ${{ matrix.version }}
20+
name: ${{ matrix.target.name }} / nightly
2321
runs-on: ${{ matrix.target.os }}
2422

2523
services:
@@ -30,15 +28,16 @@ jobs:
3028
options: --entrypoint redis-server
3129

3230
steps:
33-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3432

35-
- name: Install Rust (${{ matrix.version }})
36-
uses: actions-rust-lang/setup-rust-toolchain@v1
33+
- name: Install Rust (nightly)
34+
uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
3735
with:
38-
toolchain: ${{ matrix.version }}
36+
toolchain: nightly
3937

40-
- uses: taiki-e/cache-cargo-install-action@v1
41-
with: { tool: cargo-hack }
38+
- uses: taiki-e/[email protected]
39+
with:
40+
tool: cargo-hack
4241

4342
- name: check minimal
4443
run: cargo ci-min
@@ -61,30 +60,26 @@ jobs:
6160
build_and_test_other_nightly:
6261
strategy:
6362
fail-fast: false
63+
# prettier-ignore
6464
matrix:
6565
target:
6666
- { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
67-
- {
68-
name: Windows,
69-
os: windows-latest,
70-
triple: x86_64-pc-windows-msvc,
71-
}
72-
version:
73-
- nightly
74-
75-
name: ${{ matrix.target.name }} / ${{ matrix.version }}
67+
- { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
68+
69+
name: ${{ matrix.target.name }} / nightly
7670
runs-on: ${{ matrix.target.os }}
7771

7872
steps:
79-
- uses: actions/checkout@v3
73+
- uses: actions/checkout@v4
8074

81-
- name: Install Rust (${{ matrix.version }})
82-
uses: actions-rust-lang/setup-rust-toolchain@v1
75+
- name: Install Rust (nightly)
76+
uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
8377
with:
84-
toolchain: ${{ matrix.version }}
78+
toolchain: nightly
8579

86-
- uses: taiki-e/cache-cargo-install-action@v1
87-
with: { tool: cargo-hack }
80+
- uses: taiki-e/[email protected]
81+
with:
82+
tool: cargo-hack
8883

8984
- name: check minimal
9085
run: cargo ci-min

‎.github/workflows/ci.yml

Lines changed: 40 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
name: CI
22

33
on:
4-
pull_request: {}
5-
push: { branches: [master] }
4+
pull_request:
5+
types: [opened, synchronize, reopened]
6+
merge_group:
7+
types: [checks_requested]
8+
push:
9+
branches: [master]
610

711
permissions: { contents: read }
812

@@ -18,10 +22,10 @@ jobs:
1822
target:
1923
- { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
2024
version:
21-
- '1.60' # MSRV
22-
- stable
25+
- { name: msrv, version: 1.68.0 }
26+
- { name: stable, version: stable }
2327

24-
name: ${{ matrix.target.name }} / ${{ matrix.version }}
28+
name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
2529
runs-on: ${{ matrix.target.os }}
2630

2731
services:
@@ -37,21 +41,22 @@ jobs:
3741
--entrypoint redis-server
3842
3943
steps:
40-
- uses: actions/checkout@v3
44+
- uses: actions/checkout@v4
4145

42-
- name: Install Rust (${{ matrix.version }})
43-
uses: actions-rust-lang/setup-rust-toolchain@v1
46+
- name: Install Rust (${{ matrix.version.name }})
47+
uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
4448
with:
45-
toolchain: ${{ matrix.version }}
49+
toolchain: ${{ matrix.version.version }}
4650

4751
- name: Install cargo-hack
48-
uses: taiki-e/cache-cargo-install-action@v1
49-
with: { tool: cargo-hack }
52+
uses: taiki-e/[email protected]
53+
with:
54+
tool: cargo-hack
5055

51-
- name: workaround MSRV issues
52-
if: matrix.version != 'stable'
53-
run: |
54-
cargo update -p=time:0.3.20 --precise=0.3.16
56+
# - name: workaround MSRV issues
57+
# if: matrix.version.name == 'msrv'
58+
# run: |
59+
# cargo update -p=time:0.3.20 --precise=0.3.16
5560

5661
- name: check minimal
5762
run: cargo ci-min
@@ -75,36 +80,34 @@ jobs:
7580
strategy:
7681
fail-fast: false
7782
matrix:
83+
# prettier-ignore
7884
target:
7985
- { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
80-
- {
81-
name: Windows,
82-
os: windows-latest,
83-
triple: x86_64-pc-windows-msvc,
84-
}
86+
- { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
8587
version:
86-
- '1.60' # MSRV
87-
- stable
88+
- { name: msrv, version: 1.68.0 }
89+
- { name: stable, version: stable }
8890

89-
name: ${{ matrix.target.name }} / ${{ matrix.version }}
91+
name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
9092
runs-on: ${{ matrix.target.os }}
9193

9294
steps:
93-
- uses: actions/checkout@v3
95+
- uses: actions/checkout@v4
9496

95-
- name: Install Rust (${{ matrix.version }})
96-
uses: actions-rust-lang/setup-rust-toolchain@v1
97+
- name: Install Rust (${{ matrix.version.name }})
98+
uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
9799
with:
98-
toolchain: ${{ matrix.version }}
100+
toolchain: ${{ matrix.version.version }}
99101

100102
- name: Install cargo-hack
101-
uses: taiki-e/cache-cargo-install-action@v1
102-
with: { tool: cargo-hack }
103+
uses: taiki-e/[email protected]
104+
with:
105+
tool: cargo-hack
103106

104-
- name: workaround MSRV issues
105-
if: matrix.version != 'stable'
106-
run: |
107-
cargo update -p=time:0.3.20 --precise=0.3.16
107+
# - name: workaround MSRV issues
108+
# if: matrix.version.name == 'msrv'
109+
# run: |
110+
# cargo update -p=time:0.3.20 --precise=0.3.16
108111

109112
- name: check minimal
110113
run: cargo ci-min
@@ -128,11 +131,12 @@ jobs:
128131
name: doc tests
129132
runs-on: ubuntu-latest
130133
steps:
131-
- uses: actions/checkout@v3
134+
- uses: actions/checkout@v4
132135

133136
- name: Install Rust (nightly)
134-
uses: actions-rust-lang/setup-rust-toolchain@v1
135-
with: { toolchain: nightly }
137+
uses: actions-rust-lang/[email protected]
138+
with:
139+
toolchain: nightly
136140

137141
- name: doc tests
138142
timeout-minutes: 40

‎.github/workflows/coverage.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
name: Coverage
22

33
on:
4-
push: { branches: [master] }
4+
push:
5+
branches: [master]
56

67
permissions: { contents: read }
78

@@ -21,11 +22,12 @@ jobs:
2122
options: --entrypoint redis-server
2223

2324
steps:
24-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2526

2627
- name: Install Rust (nightly)
27-
uses: actions-rust-lang/setup-rust-toolchain@v1
28-
with: { toolchain: nightly }
28+
uses: actions-rust-lang/[email protected]
29+
with:
30+
toolchain: nightly
2931

3032
- name: Generate coverage file
3133
run: |
@@ -34,4 +36,5 @@ jobs:
3436
3537
- name: Upload to Codecov
3638
uses: codecov/codecov-action@v3
37-
with: { file: cobertura.xml }
39+
with:
40+
file: cobertura.xml

‎.github/workflows/lint.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
fmt:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616

1717
- name: Install Rust (nightly)
18-
uses: actions-rust-lang/setup-rust-toolchain@v1
18+
uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
1919
with:
2020
toolchain: nightly
2121
components: rustfmt
@@ -26,33 +26,36 @@ jobs:
2626
clippy:
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030

3131
- name: Install Rust
32-
uses: actions-rust-lang/setup-rust-toolchain@v1
33-
with: { components: clippy }
32+
uses: actions-rust-lang/[email protected]
33+
with:
34+
components: clippy
3435

3536
- name: Check with Clippy
36-
run: cargo clippy --workspace --tests --all-features
37+
run: cargo clippy --workspace --tests --all-features -- -A unknown_lints
3738

3839
public-api-diff:
3940
runs-on: ubuntu-latest
4041
steps:
4142
- name: checkout ${{ github.base_ref }}
42-
uses: actions/checkout@v3
43+
uses: actions/checkout@v4
4344
with:
4445
ref: ${{ github.base_ref }}
4546

4647
- name: checkout ${{ github.head_ref }}
47-
uses: actions/checkout@v3
48+
uses: actions/checkout@v4
4849

4950
- name: Install Rust (nightly)
50-
uses: actions-rust-lang/setup-rust-toolchain@v1
51-
with: { toolchain: nightly }
51+
uses: actions-rust-lang/[email protected]
52+
with:
53+
toolchain: nightly
5254

5355
- name: Install cargo-public-api
54-
uses: taiki-e/cache-cargo-install-action@v1
55-
with: { tool: cargo-public-api }
56+
uses: taiki-e/[email protected]
57+
with:
58+
tool: cargo-public-api
5659

5760
- name: generate API diff
5861
run: |

‎.github/workflows/upload-doc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515

1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818

1919
- name: Install Rust (nightly)
20-
uses: actions-rust-lang/setup-rust-toolchain@v1
20+
uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
2121
with: { toolchain: nightly }
2222

2323
- name: Build Docs
@@ -27,7 +27,7 @@ jobs:
2727
run: echo '<meta http-equiv="refresh" content="0;url=actix_cors/index.html">' > target/doc/index.html
2828

2929
- name: Deploy to GitHub Pages
30-
uses: JamesIves/github-pages-deploy-action@3.7.1
30+
uses: JamesIves/github-pages-deploy-action@v4.4.3
3131
with:
3232
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3333
BRANCH: gh-pages

‎Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ members = [
1111
"actix-web-httpauth",
1212
]
1313

14-
# TODO(MSRV 1.64)
15-
# [workspace.package]
16-
# edition = "2018"
17-
# rust-version = "1.60"
14+
[workspace.package]
15+
license = "MIT OR Apache-2.0"
16+
edition = "2021"
17+
rust-version = "1.68"
1818

1919
[patch.crates-io]
2020
actix-cors = { path = "./actix-cors" }

0 commit comments

Comments
 (0)