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.

Sign up for GitHub

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

Jump to bottom

CI: Improve msrv checking and speedup CI #74

Merged
merged 17 commits into from
Mar 11, 2024
Merged

CI: Improve msrv checking and speedup CI #74

merged 17 commits into from
Mar 11, 2024

Conversation

NobodyXu
Copy link
Contributor

@NobodyXu NobodyXu commented Mar 2, 2024 •
edited
Loading

Improve msrv CI:

  • Include a lockfile Cargo.lock created using cargo +nightly -Zminimal-versions update and used in msrv job to make sure it tests against the minimal version of dependencies.
  • Run cargo-check to check for msrv (in a new job), running cargo-test would also pull in test dependencies and test code

This PR also speeds up the CI from 5m down to 1m (when make and dependencies are cached).

@NobodyXu
Speedup CI: Cache make 4.4.1 compiled
c3da86d 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Speedup CI: Use macos-14 instead of macos-latest
5fe2b1f 
macos-14 uses M1, it's much faster than macos-latest

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Speedup CI: Use Swatinem/rust-cache@v2 for caching rust compilation
dc07da6 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix make compilation: Keep it disabled it on windows
9c4cb32 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Speedup CI: Always Use sparse registry
8bfcb02 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Speedup CI: Run cargo-update before caching
887ee76 
So that it knows which specific version is used to invalidate caching.

Also, on 1.63 fetching from registry is especially slow, running
`cargo +stable update` befoe this can speed it up a little bit.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
CI: Add new job msrv
ea73b68 
It uses `-Zminimal` to use minimal versions.

It also avoids compilation to speedup CI as much as possible.

Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix CI: install rust nightly for job msrv
3399dcf 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix msrv: Use -Zminimal-versions, not -ZAminimal
8ee8e39 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
epage
epage reviewed Mar 3, 2024
View reviewed changes
.github/workflows/main.yml Outdated Show resolved Hide resolved
epage
epage reviewed Mar 3, 2024
View reviewed changes
.github/workflows/main.yml Outdated Show resolved Hide resolved
@NobodyXu
Improve msrv mCI: Use cargo-hack instead of hard-coding msrv in CI
facdf56 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Add Cargo.msrv.lock, created using -Zminimal-versions
740f5ba 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu NobodyXu requested review from epage and riking March 4, 2024 13:09
@NobodyXu NobodyXu mentioned this pull request Mar 6, 2024
Merged
@NobodyXu
Rename Cargo.msrv.lock -> Cargo.lock
4b0188a 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix CI job msrv
0e734ee 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
epage
epage reviewed Mar 6, 2024
View reviewed changes
.github/workflows/main.yml Outdated Show resolved Hide resolved
epage
epage reviewed Mar 6, 2024
View reviewed changes
.github/workflows/main.yml Outdated Show resolved Hide resolved
@NobodyXu
Use --locked when testing and checking msrv
52db6fd 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix testing: Remove old dev-deps
452de48 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu
Fix macOS compilation: Upgrade libc to 0.2.72
34a4b24 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu NobodyXu requested a review from epage March 8, 2024 13:02
epage
epage approved these changes Mar 8, 2024
View reviewed changes
Copy link

@epage epage left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For CI. I don't deal enough with this to speak to the test changes

weihanglo
weihanglo reviewed Mar 10, 2024
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for working on this. Glad to see the huge improvement on CI time!

I'd love to have a clearer git history. It doesn't mean we need to squash commits. Just let it make more sense and remove some intermediate commits during the development.

tests/client.rs Outdated Show resolved Hide resolved
Cargo.lock Outdated Show resolved Hide resolved
@NobodyXu
Bump tempfile 3.10.1
696077d 
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
@NobodyXu NobodyXu requested a review from weihanglo March 11, 2024 12:18
weihanglo
weihanglo approved these changes Mar 11, 2024
View reviewed changes
Copy link
Member

@weihanglo weihanglo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given both CI and test are reviewed, I am going to merge this. Thank you!

@weihanglo weihanglo merged commit 0d10b47 into rust-lang:main Mar 11, 2024
14 checks passed
@NobodyXu NobodyXu deleted the speedup-ci branch March 11, 2024 12:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weihanglo weihanglo weihanglo approved these changes

@epage epage epage approved these changes

@riking riking Awaiting requested review from riking

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@NobodyXu @epage @riking @weihanglo