From 11b9039f107d2105266e85cb4bedd3a80716d350 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Wed, 11 Sep 2024 21:52:56 +0200 Subject: [PATCH 1/4] ci: Upgrade checkout action to v4 --- .github/workflows/CI.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index bb4e5625..4933d83e 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -10,7 +10,7 @@ jobs: check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - name: Install protoc uses: taiki-e/install-action@v2 @@ -21,7 +21,7 @@ jobs: check-docs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - name: Install protoc uses: taiki-e/install-action@v2 @@ -36,7 +36,7 @@ jobs: cargo-hack: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable - uses: taiki-e/install-action@cargo-hack - name: Install protoc @@ -57,7 +57,7 @@ jobs: matrix: rust: [stable, beta, nightly] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ matrix.rust }} @@ -71,7 +71,7 @@ jobs: needs: check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@1.66 - name: Install protoc uses: taiki-e/install-action@v2 @@ -84,7 +84,7 @@ jobs: needs: check runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable with: components: rustfmt @@ -104,7 +104,7 @@ jobs: - advisories - bans licenses sources steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: EmbarkStudios/cargo-deny-action@v1 with: manifest-path: tower-http/Cargo.toml @@ -113,7 +113,7 @@ jobs: cargo-public-api-crates: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@nightly - uses: Swatinem/rust-cache@v2 - name: Install cargo-public-api-crates From 9ca77fb0a776598adb903e14a9e1b136302b6220 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Wed, 11 Sep 2024 21:53:08 +0200 Subject: [PATCH 2/4] ci: Pin old nightly for cargo-public-api-crates --- .github/workflows/CI.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 4933d83e..d950b441 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -114,7 +114,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@nightly + # Pinned version due to failing `cargo-public-api-crates`. + - uses: dtolnay/rust-toolchain@master + with: + toolchain: nightly-2024-06-06 - uses: Swatinem/rust-cache@v2 - name: Install cargo-public-api-crates run: | From 0647576f19d76f7747377809551b7bb6fea449e8 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Wed, 11 Sep 2024 21:56:25 +0200 Subject: [PATCH 3/4] ci: Build rustdoc before calling cargo-public-api-crates --- .github/workflows/CI.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index d950b441..71842b7f 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -122,5 +122,8 @@ jobs: - name: Install cargo-public-api-crates run: | cargo install --git https://github.com/davidpdrsn/cargo-public-api-crates + - name: Build rustdoc + run: | + cargo rustdoc --all-features --manifest-path tower-http/Cargo.toml -- -Z unstable-options --output-format json - name: cargo public-api-crates check - run: cargo public-api-crates --manifest-path tower-http/Cargo.toml check + run: cargo public-api-crates --manifest-path tower-http/Cargo.toml --skip-build check From 814373a03ee1e1f13ff19251b8089dbc54e39222 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 19 Sep 2024 14:32:33 +0200 Subject: [PATCH 4/4] ci: Downgrade tokio-util to fix MSRV job --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 71842b7f..c1084961 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -78,6 +78,7 @@ jobs: with: tool: protoc@3.20.3 - run: cargo update -p tokio --precise 1.38.1 + - run: cargo update -p tokio-util --precise 0.7.11 - run: cargo test -p tower-http --all-features style: