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: Naming adjustments and cleanup #4124

Merged
merged 13 commits into from
Nov 20, 2024
Merged

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Nov 20, 2024

Make job names more clear, leverage GHA matrix some more, and clean up some shell scripts.

@rustbot
Copy link
Collaborator

rustbot commented Nov 20, 2024

r? @JohnTitor

rustbot has assigned @JohnTitor.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-CI Area: CI-related items S-waiting-on-review labels Nov 20, 2024
@tgross35 tgross35 changed the title ci: Adjust the way some things are named ci: Naming adjustments and cleanup Nov 20, 2024
@tgross35 tgross35 force-pushed the ci-naming branch 9 times, most recently from ddb7fe1 to 5b7dd81 Compare November 20, 2024 10:14
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Nov 20, 2024
@tgross35 tgross35 force-pushed the ci-naming branch 14 times, most recently from fb54029 to 07abe08 Compare November 20, 2024 11:44
@bors
Copy link
Contributor

bors commented Nov 20, 2024

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

The Mac, Windows, and Linux jobs for build channels are pretty
redundant. Turn this into a single `verify_build` job that has both OS
and version in its matrix. For consistency, rename the script to
`verify-build`.

To simplify variables, allow the build and toolchain scripts to detect
the OS rather than passing it from CI.
The Mac, Windows, and Linux jobs for testing are pretty redundant.  Turn
this into a single `test_tier1` job that runs all expected combinations.
Solaris is a Tier 2 target so defer it until after tier1 completes. We
currently do this for the other T2 targets. In preparation of adding
other VM tests to the matrix, adjust naming.

Additionally, just `set -x` rather than priting the commands before
running them.
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
We no longer have two separate workflows, so rename `full_ci` to just
`ci`.

Additionally, `.yaml` is the preferred extension [1], so rename the
other `.yml` file to `.yaml`.

[1]: https://yaml.org/faq.html

(backport <rust-lang#4124>)
(cherry picked from commit 4c96512)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
The scripts say how they should execute, there isn't any reason to
duplicate this wherever they are called.

(backport <rust-lang#4124>)
(cherry picked from commit 4707c5d)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
This cleans things up and allows us to pass more flags externally.

(backport <rust-lang#4124>)
(cherry picked from commit 67988b7)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
(backport <rust-lang#4124>)
(cherry picked from commit bbf941b)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
(backport <rust-lang#4124>)
(cherry picked from commit c90236b)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
The Mac, Windows, and Linux jobs for build channels are pretty
redundant. Turn this into a single `verify_build` job that has both OS
and version in its matrix. For consistency, rename the script to
`verify-build`.

To simplify variables, allow the build and toolchain scripts to detect
the OS rather than passing it from CI.

(backport <rust-lang#4124>)
(cherry picked from commit c4e3ff8)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
The Mac, Windows, and Linux jobs for testing are pretty redundant.  Turn
this into a single `test_tier1` job that runs all expected combinations.

(backport <rust-lang#4124>)
(cherry picked from commit 01244c5)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
Solaris is a Tier 2 target so defer it until after tier1 completes. We
currently do this for the other T2 targets. In preparation of adding
other VM tests to the matrix, adjust naming.

Additionally, just `set -x` rather than priting the commands before
running them.

(backport <rust-lang#4124>)
(cherry picked from commit 549eb77)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Nov 20, 2024
(backport <rust-lang#4124>)
(cherry picked from commit 0892b44)
@tgross35 tgross35 added this pull request to the merge queue Nov 20, 2024
Merged via the queue into rust-lang:main with commit b749815 Nov 20, 2024
45 checks passed
@tgross35 tgross35 deleted the ci-naming branch November 20, 2024 17:07
@tgross35 tgross35 added stable-applied This PR has been cherry-picked to libc's stable release branch and removed stable-nominated This PR should be considered for cherry-pick to libc's stable release branch labels Nov 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-CI Area: CI-related items S-waiting-on-review stable-applied This PR has been cherry-picked to libc's stable release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants