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: merge msvc test CI jobs #112633

Merged
merged 1 commit into from
Jun 15, 2023
Merged

CI: merge msvc test CI jobs #112633

merged 1 commit into from
Jun 15, 2023
+11 −39

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Jun 14, 2023 •
edited
Loading

Merges msvc jobs together to save CI time. Currently, both runners take about 1h 15 minutes, but nowadays it should be possible to just run everything in a single job.

CI run: https://github.com/rust-lang/rust/actions/runs/5272144087/jobs/9534015536?pr=112633 (both finish under ~1h 35 minutes)

After this change, we no longer test both x.py and x.ps1, but I don't suppose that it's worth it to spend 1.5 hours of additional CI time just for that. I suggest to run all tests using e.g. x.py and then run just x.ps1 test --stage 2 --force-rerun tests/<single-quick-test>.
Also I'm not sure if it's worth it to keep using the Makefile for this.

@rustbot
Copy link
Collaborator

rustbot commented Jun 14, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Jun 14, 2023
@Kobzol Kobzol marked this pull request as ready for review June 15, 2023 06:41
@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 15, 2023

r? @jyn514

@rustbot rustbot assigned jyn514 and unassigned Mark-Simulacrum Jun 15, 2023
@Kobzol Kobzol mentioned this pull request Jun 15, 2023
Merged
@pietroalbini
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Contributor

bors commented Jun 15, 2023

📌 Commit 895eb30 has been approved by pietroalbini

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 15, 2023
@Kobzol
Copy link
Contributor Author

Kobzol commented Jun 15, 2023

After this change, we no longer test both x.py and x.ps1, but I don't suppose that it's worth it to spend 1.5 hours of additional CI time just for that. I suggest to run all tests using e.g. x.py and then run just x.ps1 test --stage 2 --force-rerun tests/.

We should probably also resolve this somehow (if testing .ps1 is still important), so that this doesn't actually regress test coverage.

@jyn514
Copy link
Member

jyn514 commented Jun 15, 2023

After this change, we no longer test both x.py and x.ps1, but I don't suppose that it's worth it to spend 1.5 hours of additional CI time just for that. I suggest to run all tests using e.g. x.py and then run just x.ps1 test --stage 2 --force-rerun tests/.

We should probably also resolve this somehow (if testing .ps1 is still important), so that this doesn't actually regress test coverage.

you could run x.py test tidy && x.ps1 test --exclude tidy

@jyn514
Copy link
Member

jyn514 commented Jun 15, 2023

yeah it would be nice to delete things from the makefile if possible, they end up being user facing but i don't want anyone relying on the existance of a random mingw rule

@jyn514 jyn514 assigned pietroalbini and unassigned jyn514 Jun 15, 2023
@bors
Copy link
Contributor

bors commented Jun 15, 2023

⌛ Testing commit 895eb30 with merge f9097f8...

@bors
Copy link
Contributor

bors commented Jun 15, 2023

☀️ Test successful - checks-actions
Approved by: pietroalbini
Pushing f9097f8 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 15, 2023
@bors bors merged commit f9097f8 into rust-lang:master Jun 15, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 15, 2023
@Kobzol Kobzol deleted the ci-msvc-merge branch June 15, 2023 16:29
@Kobzol Kobzol mentioned this pull request Jun 15, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (f9097f8): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 5.3% [2.7%, 7.8%] 2
Regressions ❌
(secondary)		 2.1% [2.1%, 2.1%] 1
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 5.3% [2.7%, 7.8%] 2

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 647.802s -> 648.042s (0.04%)

compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jun 18, 2023
@compiler-errors
Rollup merge of rust-lang#112668 - Kobzol:ci-msvc-ps1, r=pietroalbini
f8a4a14 
Test `x.ps1` in `msvc` CI job

Small adjustment to rust-lang#112633, to resolve [this comment](rust-lang#112633 (comment)).

r? `@pietroalbini`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 18, 2023
@bors
Auto merge of rust-lang#112645 - Kobzol:ci-mingw-merge, r=pietroalbini
2d0aa57 
CI: merge `mingw` test CI jobs

Same as rust-lang#112633, but for `mingw`. From the logs it looks like the runner spends 40 minutes compiling `rustc`, and then `10`/`20` minutes running tests. It seems wasteful to split that into two jobs.

CI run: https://github.com/rust-lang/rust/actions/runs/5275702134/jobs/9541479343?pr=112645

r? `@jyn514`
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jun 18, 2023
@compiler-errors
Rollup merge of rust-lang#112668 - Kobzol:ci-msvc-ps1, r=pietroalbini
b099173 
Test `x.ps1` in `msvc` CI job

Small adjustment to rust-lang#112633, to resolve [this comment](rust-lang#112633 (comment)).

r? `@pietroalbini`
bors added a commit to rust-lang/miri that referenced this pull request Jun 22, 2023
@bors
Auto merge of #112645 - Kobzol:ci-mingw-merge, r=pietroalbini
9125392 
CI: merge `mingw` test CI jobs

Same as rust-lang/rust#112633, but for `mingw`. From the logs it looks like the runner spends 40 minutes compiling `rustc`, and then `10`/`20` minutes running tests. It seems wasteful to split that into two jobs.

CI run: https://github.com/rust-lang/rust/actions/runs/5275702134/jobs/9541479343?pr=112645

r? `@jyn514`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@pietroalbini pietroalbini

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.72.0
Development

Successfully merging this pull request may close these issues.
7 participants
@Kobzol @rustbot @pietroalbini @bors @jyn514 @rust-timer @Mark-Simulacrum