Skip to content

Conversation

tgross35
Copy link
Contributor

@tgross35 tgross35 commented Dec 7, 2024

This gives us something that is easier to look at when the automatically generated tests fail.

@rustbot
Copy link
Collaborator

rustbot commented Dec 7, 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 Dec 7, 2024
@tgross35 tgross35 force-pushed the ci-artifacts branch 4 times, most recently from f494bd4 to 09ce7a3 Compare December 7, 2024 09:23
@bors
Copy link
Contributor

bors commented Dec 7, 2024

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

@tgross35 tgross35 force-pushed the ci-artifacts branch 8 times, most recently from 76d4b83 to 5940b90 Compare December 8, 2024 00:32
@tgross35 tgross35 enabled auto-merge December 8, 2024 00:32
@tgross35
Copy link
Contributor Author

tgross35 commented Dec 8, 2024

@asomers it seems like the FreeBSD 15 runner is giving us an error that CAP_UNUSED0_44 is undeclared. Do you know if there is a recent change that we should adjust or skip this for?

@tgross35 tgross35 added this pull request to the merge queue Dec 8, 2024
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 8, 2024
@asomers
Copy link
Contributor

asomers commented Dec 8, 2024

Yep. freebsd/freebsd-src@b165e9e deleted that definition. I wonder if we should just delete all of the CAP_UNUSED constants, for the same reason that we don't allow constants like XXX_MAX or RLIM_NLIMITS?

@asomers
Copy link
Contributor

asomers commented Dec 8, 2024

@tgross35 see #4183 and #4184 for the CAP_UNUSED0_44 fix.

@tgross35
Copy link
Contributor Author

tgross35 commented Dec 8, 2024

I was going to say it's entirely up to you, it seemed like capsicum was the only user based on a quick search. Appreciate the fast PRs.

This gives us something easier to inspect when the automatically
generated tests fail.
@tgross35 tgross35 enabled auto-merge December 8, 2024 23:59
@tgross35 tgross35 added the stable-nominated This PR should be considered for cherry-pick to libc's stable release branch label Dec 8, 2024
@tgross35 tgross35 added this pull request to the merge queue Dec 9, 2024
Merged via the queue into rust-lang:main with commit 962dcb3 Dec 9, 2024
45 checks passed
@tgross35 tgross35 deleted the ci-artifacts branch December 9, 2024 01:27
tgross35 added a commit to tgross35/rust-libc that referenced this pull request Dec 9, 2024
This gives us something easier to inspect when the automatically
generated tests fail.

(backport <rust-lang#4180>)
(cherry picked from commit 68f3056)
@tgross35 tgross35 mentioned this pull request Dec 9, 2024
@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 Dec 18, 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.

5 participants