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: remove expand-yaml-anchors #124366

Merged
merged 7 commits into from
Apr 30, 2024
Merged

CI: remove expand-yaml-anchors #124366

merged 7 commits into from
Apr 30, 2024

Conversation

Kobzol
Copy link
Contributor

@Kobzol Kobzol commented Apr 25, 2024 •
edited
Loading

This PR unifies all CI outcome jobs in a single job, and then removes the expand-yaml-anchors tool, since it is no longer needed after this change.

I have tested try builds for both situations with the new outcome job (note that these two workflow runs use a different step structure in the outcome job, I have simplified it since):

r? @ghost

@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 Apr 25, 2024
@Kobzol
Copy link
Contributor Author

Kobzol commented Apr 25, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 25, 2024
@bors
Auto merge of rust-lang#124366 - Kobzol:remove-yaml-expansion, r=<try>
6629a69 
CI: remove `expand-yaml-anchors`

Opening for experiments.

Blocked on rust-lang#124332 (first 4 commits are from that PR).

r? `@ghost`
@bors
Copy link
Contributor

bors commented Apr 25, 2024

⌛ Trying commit 0ef1a7e with merge 6629a69...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Apr 25, 2024

💔 Test failed - checks-actions

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 25, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol Kobzol force-pushed the remove-yaml-expansion branch 2 times, most recently from e199ee3 to de430f5 Compare April 25, 2024 11:10
@Kobzol
Copy link
Contributor Author

Kobzol commented Apr 25, 2024

@bors try

@bors
Copy link
Contributor

bors commented Apr 25, 2024

⌛ Trying commit de430f5 with merge 9026eae...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 25, 2024
@bors
Auto merge of rust-lang#124366 - Kobzol:remove-yaml-expansion, r=<try>
9026eae 
CI: remove `expand-yaml-anchors`

Opening for experiments.

Blocked on rust-lang#124332 (first 4 commits are from that PR).

r? `@ghost`
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Apr 25, 2024

☀️ Try build successful - checks-actions
Build commit: 9026eae (9026eaea7f4d73bdbe0222ae18a230d6d37a3bac)

@Kobzol Kobzol force-pushed the remove-yaml-expansion branch from de430f5 to 29d935d Compare April 25, 2024 12:53
@Kobzol
Copy link
Contributor Author

Kobzol commented Apr 25, 2024

@bors try

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol
Copy link
Contributor Author

Kobzol commented Apr 25, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 25, 2024
@bors
Auto merge of rust-lang#124366 - Kobzol:remove-yaml-expansion, r=<try>
f42f9b6 
CI: remove `expand-yaml-anchors`

This PR unifies all CI outcome jobs in a single job, and then removes the `expand-yaml-anchors` tool, since it is no longer needed after this change.

Opening for experiments.

Blocked on rust-lang#124332 (first 4 commits are from that PR).

r? `@ghost`
@bors
Copy link
Contributor

bors commented Apr 25, 2024

⌛ Trying commit 29d935d with merge f42f9b6...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Apr 25, 2024

💔 Test failed - checks-actions

@Kobzol Kobzol force-pushed the remove-yaml-expansion branch from 29d935d to ad32fc5 Compare April 25, 2024 13:04
@Kobzol Kobzol marked this pull request as ready for review April 26, 2024 18:34
@rustbot
Copy link
Collaborator

rustbot commented Apr 26, 2024

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

@Kobzol Kobzol force-pushed the remove-yaml-expansion branch from ad32fc5 to 4de6ac6 Compare April 27, 2024 10:09
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol Kobzol force-pushed the remove-yaml-expansion branch 2 times, most recently from 61ab269 to 47767ac Compare April 27, 2024 10:20
@pietroalbini
Copy link
Member

r=me after rebase

@bors
Copy link
Contributor

bors commented Apr 29, 2024

☔ The latest upstream changes (presumably #124332) made this pull request unmergeable. Please resolve the merge conflicts.

@Kobzol Kobzol force-pushed the remove-yaml-expansion branch from 47767ac to b194d5c Compare April 29, 2024 19:34
@Kobzol
Copy link
Contributor Author

Kobzol commented Apr 29, 2024

@bors try

@bors
Copy link
Contributor

bors commented Apr 29, 2024

⌛ Trying commit b194d5c with merge 8e1859f...

bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 29, 2024
@bors
Auto merge of rust-lang#124366 - Kobzol:remove-yaml-expansion, r=<try>
8e1859f 
CI: remove `expand-yaml-anchors`

This PR unifies all CI outcome jobs in a single job, and then removes the `expand-yaml-anchors` tool, since it is no longer needed after this change.

I have tested try builds for both situations with the new `outcome` job (note that these two workflow runs use a different step structure in the outcome job, I have simplified it since):
- [Success](https://github.com/rust-lang-ci/rust/actions/runs/8831529677/job/24251135366)
- [Failure](https://github.com/rust-lang-ci/rust/actions/runs/8833052319/job/24251628792)

r? `@ghost`
@bors
Copy link
Contributor

bors commented Apr 29, 2024

☀️ Try build successful - checks-actions
Build commit: 8e1859f (8e1859f6f0898daf8553fabd8c1a2ae8a15cf63a)

@Kobzol
Copy link
Contributor Author

Kobzol commented Apr 30, 2024

@bors r=pietroalbini rollup=iffy

@bors
Copy link
Contributor

bors commented Apr 30, 2024

📌 Commit b194d5c 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 30, 2024
@bors
Copy link
Contributor

bors commented Apr 30, 2024

⌛ Testing commit b194d5c with merge 72f6162...

@bors
Copy link
Contributor

bors commented Apr 30, 2024

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 30, 2024
@bors bors merged commit 72f6162 into rust-lang:master Apr 30, 2024
7 checks passed
@rustbot rustbot added this to the 1.80.0 milestone Apr 30, 2024
@Kobzol Kobzol deleted the remove-yaml-expansion branch April 30, 2024 09:03
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (72f6162): 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)		 - - 0
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.1% [-0.1%, -0.1%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.1% [-0.1%, -0.1%] 1

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: 673.535s -> 672.74s (-0.12%)
Artifact size: 315.88 MiB -> 316.01 MiB (0.04%)

@Kobzol Kobzol mentioned this pull request May 6, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pietroalbini pietroalbini pietroalbini left review comments

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.80.0
Development

Successfully merging this pull request may close these issues.
6 participants
@Kobzol @bors @rust-log-analyzer @rustbot @pietroalbini @rust-timer