Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: update cargo-check-external-types toolchain, fix build #276

Merged
merged 3 commits into from
May 28, 2024

Conversation

cpu
Copy link
Member

@cpu cpu commented May 28, 2024

For cargo-check-external-types, the upstream project cut a 0.1.12 release that now pins Rust nightly-2024-05-01. This commit updates CI to match.

For the time dep, a bump in the Cargo.lock was required to fix the project build w/ nightly.

Lastly, the project's builds of main using nightly are hitting an upstream bug (rust-lang/rust#125474), take the same workaround we landed in Rustls (rustls/rustls#1971) to unbreak the build while this is sorted out.

The upstream project cut a 0.1.12 release that now pins Rust
nightly-2024-05-01. This commit updates CI to match.
@cpu cpu self-assigned this May 28, 2024
* 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<_>`
```
@cpu cpu changed the title ci: update cargo-check-external-types toolchain ci: update cargo-check-external-types toolchain, fix build May 28, 2024
@cpu cpu marked this pull request as draft May 28, 2024 19:58
@cpu cpu force-pushed the cpu-fix-external-types-check branch from fff36c3 to 4972f51 Compare May 28, 2024 20:02
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.
@cpu cpu force-pushed the cpu-fix-external-types-check branch from 4972f51 to edbb716 Compare May 28, 2024 20:04
@cpu
Copy link
Member Author

cpu commented May 28, 2024

cpu marked this pull request as draft 6 minutes ago

Tripping over a handful of breakages. I'll flip this back once the build is green.

@cpu cpu marked this pull request as ready for review May 28, 2024 20:30
@cpu
Copy link
Member Author

cpu commented May 28, 2024

I'll flip this back once the build is green.

All set.

@cpu
Copy link
Member Author

cpu commented May 28, 2024

These changes are pretty small/boring, going to merge with one review to unbreak main's CI.

@cpu cpu added this pull request to the merge queue May 28, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks May 28, 2024
@cpu
Copy link
Member Author

cpu commented May 28, 2024

github-merge-queue bot removed this pull request from the merge queue due to failed status checks

Hmm, unclear what happened here. The failed CI task ("build (ubuntu-latest, beta)") logs ended with "Error: The operation was canceled." while running cargo check --all-targets. Let's try again.

@cpu cpu added this pull request to the merge queue May 28, 2024
Merged via the queue into rustls:main with commit 74ecaca May 28, 2024
15 checks passed
@cpu cpu deleted the cpu-fix-external-types-check branch May 28, 2024 22:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants