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

Combined CI fixes #3797

Merged
merged 5 commits into from
Aug 12, 2024
Merged

Combined CI fixes #3797

merged 5 commits into from
Aug 12, 2024

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Aug 8, 2024

Combine the following to fix CI in one go:

Once this succeeds, we can cherry pick to the 0.2 branch.

joshtriplett and others added 4 commits August 8, 2024 17:19
These targets seem to regularly break unrelated PRs, and in general we
shouldn't gate PRs on tier 3 targets (per the target tier policy).
- CI only for macOs arm64.
- Fixing build issues for macOs arm64.
- Adding macos cpu to arch api.
@rustbot
Copy link
Collaborator

rustbot commented Aug 8, 2024

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @JohnTitor (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@tgross35
Copy link
Contributor Author

tgross35 commented Aug 8, 2024

Hm, still a MacOS failure.

@nyurik
Copy link
Contributor

nyurik commented Aug 8, 2024

r? @joshtriplett

@rustbot rustbot assigned joshtriplett and unassigned JohnTitor Aug 8, 2024
@tgross35
Copy link
Contributor Author

tgross35 commented Aug 8, 2024

The failure at https://github.com/rust-lang/libc/actions/runs/10310339998/job/28541913762?pr=3797 seems to be from the changes to the rust-lang/rust workspaces. The fix was merged yesterday so should be available on today's nightly, which will be available in a couple hours. Will retry the job then and merge if it succeeds.

Edit: didn't work :(

@tgross35
Copy link
Contributor Author

tgross35 commented Aug 9, 2024

I guess the fix was merged yesterday rust-lang/cargo#14370, but the update to rust-lang/rust just missed the cutoff for the most recent nightly rust-lang/rust#128827 (comment). ~10 hours to get a newer nightly and try again.

@tgross35
Copy link
Contributor Author

Got the new nightly, but it looks like there is a new duplicate symbol failure.

@nyurik
Copy link
Contributor

nyurik commented Aug 11, 2024

Each day libc CI crashes in a creative, fun, but always in a different way...

@tgross35
Copy link
Contributor Author

tgross35 commented Aug 12, 2024

Looks like it's failing on the hexagon build test. I haven't dug into it yet but I think the builtins hexagon asm could be defining symbols that are now redundantly included as weak math intrinsics.

Going to disable that with a FIXME for now so we don't have another cycle of updating builtins and getting a new nightly. This is a tier 3 target so there should be no problems here.

`compiler-builtins` seems to be providing duplicate symbols on Hexagon.
This may be because some symbols have always been defined in assembly,
but are now also provided by the weak math symbols.

The fix for this is probably to not provide any math symbols on Hexagon
that would duplicate the assembly version. However, to avoid going
through another nightly release cycle, disable it temporarially instead.

Link: rust-lang#3797 (comment)
@tgross35 tgross35 enabled auto-merge August 12, 2024 09:37
@tgross35 tgross35 added this pull request to the merge queue Aug 12, 2024
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Aug 12, 2024
Merged via the queue into rust-lang:main with commit f3262e6 Aug 12, 2024
39 checks passed
This was referenced Aug 12, 2024
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 12, 2024
These targets seem to regularly break unrelated PRs, and in general we
shouldn't gate PRs on tier 3 targets (per the target tier policy).

(backport <rust-lang#3797>)
(cherry picked from commit be1c8e5)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 12, 2024
These targets seem to regularly break unrelated PRs, and in general we
shouldn't gate PRs on tier 3 targets (per the target tier policy).

(backport <rust-lang#3797>)
(cherry picked from commit be1c8e5)
tgross35 pushed a commit to tgross35/rust-libc that referenced this pull request Aug 12, 2024
(backport <rust-lang#3797>)
(cherry picked from commit 147222d)
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Aug 12, 2024
`compiler-builtins` seems to be providing duplicate symbols on Hexagon.
This may be because some symbols have always been defined in assembly,
but are now also provided by the weak math symbols.

The fix for this is probably to not provide any math symbols on Hexagon
that would duplicate the assembly version. However, to avoid going
through another nightly release cycle, disable it temporarially instead.

Link: rust-lang#3797 (comment)
(backport <rust-lang#3797>)
(cherry picked from commit 77e9d06)
@tgross35 tgross35 deleted the ci-fixes branch August 13, 2024 01:33
@tgross35
Copy link
Contributor Author

tgross35 commented Aug 13, 2024

Backported with #3806 with the exception of 56d665c ("macOs various updates"), which turned out to not be needed.

@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 Aug 13, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

6 participants