Merge remote-tracking branch 'upstream/master'

actix · Oct 19, 2023 · 0cde6ca · 0cde6ca
2 parents 87ec5b4 + 4bad825
commit 0cde6ca
Show file tree

Hide file tree

Showing 42 changed files with 371 additions and 346 deletions.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: cargo
+    directory: /
+    schedule:
+      interval: weekly
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly
diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml
@@ -16,10 +16,8 @@ jobs:
       matrix:
         target:
           - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
-        version:
-          - nightly
 
-    name: ${{ matrix.target.name }} / ${{ matrix.version }}
+    name: ${{ matrix.target.name }} / nightly
     runs-on: ${{ matrix.target.os }}
 
     services:
@@ -30,15 +28,16 @@ jobs:
         options: --entrypoint redis-server
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Install Rust (${{ matrix.version }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Install Rust (nightly)
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
         with:
-          toolchain: ${{ matrix.version }}
+          toolchain: nightly
 
-      - uses: taiki-e/cache-cargo-install-action@v1
-        with: { tool: cargo-hack }
+      - uses: taiki-e/install-action@v2.20.3
+        with:
+          tool: cargo-hack
 
       - name: check minimal
         run: cargo ci-min
@@ -61,30 +60,26 @@ jobs:
   build_and_test_other_nightly:
     strategy:
       fail-fast: false
+      # prettier-ignore
       matrix:
         target:
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
-          - {
-              name: Windows,
-              os: windows-latest,
-              triple: x86_64-pc-windows-msvc,
-            }
-        version:
-          - nightly
-
-    name: ${{ matrix.target.name }} / ${{ matrix.version }}
+          - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
+
+    name: ${{ matrix.target.name }} / nightly
     runs-on: ${{ matrix.target.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Install Rust (${{ matrix.version }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Install Rust (nightly)
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
         with:
-          toolchain: ${{ matrix.version }}
+          toolchain: nightly
 
-      - uses: taiki-e/cache-cargo-install-action@v1
-        with: { tool: cargo-hack }
+      - uses: taiki-e/install-action@v2.20.3
+        with:
+          tool: cargo-hack
 
       - name: check minimal
         run: cargo ci-min

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,8 +1,12 @@
 name: CI
 
 on:
-  pull_request: {}
-  push: { branches: [master] }
+  pull_request:
+    types: [opened, synchronize, reopened]
+  merge_group:
+    types: [checks_requested]
+  push:
+    branches: [master]
 
 permissions: { contents: read }
 
@@ -18,10 +22,10 @@ jobs:
         target:
           - { name: Linux, os: ubuntu-latest, triple: x86_64-unknown-linux-gnu }
         version:
-          - '1.60' # MSRV
-          - stable
+          - { name: msrv, version: 1.68.0 }
+          - { name: stable, version: stable }
 
-    name: ${{ matrix.target.name }} / ${{ matrix.version }}
+    name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
     runs-on: ${{ matrix.target.os }}
 
     services:
@@ -37,21 +41,22 @@ jobs:
           --entrypoint redis-server
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Install Rust (${{ matrix.version }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Install Rust (${{ matrix.version.name }})
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
         with:
-          toolchain: ${{ matrix.version }}
+          toolchain: ${{ matrix.version.version }}
 
       - name: Install cargo-hack
-        uses: taiki-e/cache-cargo-install-action@v1
-        with: { tool: cargo-hack }
+        uses: taiki-e/install-action@v2.20.3
+        with:
+          tool: cargo-hack
 
-      - name: workaround MSRV issues
-        if: matrix.version != 'stable'
-        run: |
-          cargo update -p=time:0.3.20 --precise=0.3.16
+      # - name: workaround MSRV issues
+      #   if: matrix.version.name == 'msrv'
+      #   run: |
+      #     cargo update -p=time:0.3.20 --precise=0.3.16
 
       - name: check minimal
         run: cargo ci-min
@@ -75,36 +80,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        # prettier-ignore
         target:
           - { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
-          - {
-              name: Windows,
-              os: windows-latest,
-              triple: x86_64-pc-windows-msvc,
-            }
+          - { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
         version:
-          - '1.60' # MSRV
-          - stable
+          - { name: msrv, version: 1.68.0 }
+          - { name: stable, version: stable }
 
-    name: ${{ matrix.target.name }} / ${{ matrix.version }}
+    name: ${{ matrix.target.name }} / ${{ matrix.version.name }}
     runs-on: ${{ matrix.target.os }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - name: Install Rust (${{ matrix.version }})
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+      - name: Install Rust (${{ matrix.version.name }})
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
         with:
-          toolchain: ${{ matrix.version }}
+          toolchain: ${{ matrix.version.version }}
 
       - name: Install cargo-hack
-        uses: taiki-e/cache-cargo-install-action@v1
-        with: { tool: cargo-hack }
+        uses: taiki-e/install-action@v2.20.3
+        with:
+          tool: cargo-hack
 
-      - name: workaround MSRV issues
-        if: matrix.version != 'stable'
-        run: |
-          cargo update -p=time:0.3.20 --precise=0.3.16
+      # - name: workaround MSRV issues
+      #   if: matrix.version.name == 'msrv'
+      #   run: |
+      #     cargo update -p=time:0.3.20 --precise=0.3.16
 
       - name: check minimal
         run: cargo ci-min
@@ -128,11 +131,12 @@ jobs:
     name: doc tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with: { toolchain: nightly }
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+        with:
+          toolchain: nightly
 
       - name: doc tests
         timeout-minutes: 40

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -1,7 +1,8 @@
 name: Coverage
 
 on:
-  push: { branches: [master] }
+  push:
+    branches: [master]
 
 permissions: { contents: read }
 
@@ -21,11 +22,12 @@ jobs:
         options: --entrypoint redis-server
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with: { toolchain: nightly }
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+        with:
+          toolchain: nightly
 
       - name: Generate coverage file
         run: |
@@ -34,4 +36,5 @@ jobs:
 
       - name: Upload to Codecov
         uses: codecov/codecov-action@v3
-        with: { file: cobertura.xml }
+        with:
+          file: cobertura.xml
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -12,10 +12,10 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
         with:
           toolchain: nightly
           components: rustfmt
@@ -26,33 +26,36 @@ jobs:
   clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Rust
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with: { components: clippy }
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+        with:
+          components: clippy
 
       - name: Check with Clippy
-        run: cargo clippy --workspace --tests --all-features
+        run: cargo clippy --workspace --tests --all-features -- -A unknown_lints
 
   public-api-diff:
     runs-on: ubuntu-latest
     steps:
       - name: checkout ${{ github.base_ref }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ref: ${{ github.base_ref }}
 
       - name: checkout ${{ github.head_ref }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1
-        with: { toolchain: nightly }
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
+        with:
+          toolchain: nightly
 
       - name: Install cargo-public-api
-        uses: taiki-e/cache-cargo-install-action@v1
-        with: { tool: cargo-public-api }
+        uses: taiki-e/cache-cargo-install-action@v1.3.0
+        with:
+          tool: cargo-public-api
 
       - name: generate API diff
         run: |

diff --git a/.github/workflows/upload-doc.yml b/.github/workflows/upload-doc.yml
@@ -14,10 +14,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Rust (nightly)
-        uses: actions-rust-lang/setup-rust-toolchain@v1
+        uses: actions-rust-lang/setup-rust-toolchain@v1.5.0
         with: { toolchain: nightly }
 
       - name: Build Docs
@@ -27,7 +27,7 @@ jobs:
         run: echo '<meta http-equiv="refresh" content="0;url=actix_cors/index.html">' > target/doc/index.html
 
       - name: Deploy to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@3.7.1
+        uses: JamesIves/github-pages-deploy-action@v4.4.3
         with:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           BRANCH: gh-pages

diff --git a/Cargo.toml b/Cargo.toml
@@ -11,10 +11,10 @@ members = [
     "actix-web-httpauth",
 ]
 
-# TODO(MSRV 1.64)
-# [workspace.package]
-# edition = "2018"
-# rust-version = "1.60"
+[workspace.package]
+license = "MIT OR Apache-2.0"
+edition = "2021"
+rust-version = "1.68"
 
 [patch.crates-io]
 actix-cors = { path = "./actix-cors" }