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

[0.2] ci: Naming adjustments and cleanup #4126

Merged
merged 15 commits into from
Nov 20, 2024

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Nov 20, 2024

In 59a18de("ci: Set `-u` (error on unset)..."), `-u` started being
passed to the `set` call in shell scripts. This broke the `FILTER` logic
since now the command always fails.

Make this a bit less fragile by explicitly setting to an empty string,
as well as adding a check that at least one test got run.

(backport <rust-lang#4125>)
(cherry picked from commit 084f370)
(backport <rust-lang#4125>)
(cherry picked from commit 907c6d6)
@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
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)
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)
This cleans things up and allows us to pass more flags externally.

(backport <rust-lang#4124>)
(cherry picked from commit 67988b7)
(backport <rust-lang#4124>)
(cherry picked from commit bbf941b)
(backport <rust-lang#4124>)
(cherry picked from commit c90236b)
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)
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)
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)
(backport <rust-lang#4124>)
(cherry picked from commit 0892b44)
@tgross35 tgross35 enabled auto-merge November 20, 2024 13:13
@tgross35 tgross35 added this pull request to the merge queue Nov 20, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Nov 20, 2024
@tgross35 tgross35 added this pull request to the merge queue Nov 20, 2024
Merged via the queue into rust-lang:libc-0.2 with commit 979575b Nov 20, 2024
45 checks passed
@tgross35 tgross35 deleted the backport-ci-naming branch November 20, 2024 18:05
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants