From a3d3cd731908569e97fe15bdfdd880dce237498d Mon Sep 17 00:00:00 2001 From: Daniel McCarney Date: Tue, 28 May 2024 15:40:14 -0400 Subject: [PATCH 1/3] ci: update cargo-check-external-types toolchain The upstream project cut a 0.1.12 release that now pins Rust nightly-2024-05-01. This commit updates CI to match. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4791f21..91c086f5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,7 @@ jobs: - name: Install rust toolchain uses: dtolnay/rust-toolchain@master with: - toolchain: nightly-2024-02-07 + toolchain: nightly-2024-05-01 # ^ sync with https://github.com/awslabs/cargo-check-external-types/blob/main/rust-toolchain.toml - run: cargo install --locked cargo-check-external-types - name: run cargo-check-external-types for rcgen/ From 4a0c4446e4331eb0a9ceae4f3a588717d16e0701 Mon Sep 17 00:00:00 2001 From: Daniel McCarney Date: Tue, 28 May 2024 15:44:25 -0400 Subject: [PATCH 2/3] deps: update time, time-macros * Updating time v0.3.34 -> v0.3.36 * Updating time-macros v0.2.17 -> v0.2.18 Fixes a build err w/ nightly of the form: ``` error[E0282]: type annotations needed for `Box<_>` ``` --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3530f13a..575b8856 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1149,9 +1149,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "itoa", @@ -1170,9 +1170,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", From edbb7167bb9a28bb73100652bd536c6cbe6a7ca2 Mon Sep 17 00:00:00 2001 From: Daniel McCarney Date: Tue, 28 May 2024 16:04:18 -0400 Subject: [PATCH 3/3] ci: temp. pin nightly to avoid ICE There's an unfixed issue with nightly rust that produces an ICE building the project w/ nightly. Pin a working version until its fixed upstream. --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 91c086f5..39529d98 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -155,7 +155,8 @@ jobs: - name: Install Rust uses: dtolnay/rust-toolchain@master with: - toolchain: ${{ matrix.toolchain }} + # TODO(XXX): Revert to "matrix.toolchain" after rust-lang/rust#125474 is fixed. + toolchain: ${{ matrix.toolchain == 'nightly' && 'nightly-2024-05-22' || matrix.toolchain }} - name: Run cargo check run: cargo check --all-targets - name: Run the tests