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

[2.3-maintenance] Wait for build users when none are available #9261

Merged
merged 3 commits into from
Nov 2, 2023

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Oct 31, 2023

Backport of #3564 to 2.3-maintenance. One commit in the series (183dd28) was skipped due too many conflicts.

Motivation / Context

TVL is currently using a set of patches backported to 2.3. WIth the recent activity in 2.3-maintenance, we'd like to upstream these patches.

Priorities

Add 👍 to pull requests you find important.

@Ericson2314
Copy link
Member

@flokli Perhaps can you add a change log entry? Pity the original didn't have one.

@Ericson2314
Copy link
Member

(It would be nice to figure out what fixed the macOS SIP issues and backport that too)

@flokli
Copy link
Contributor Author

flokli commented Oct 31, 2023

I looked, but we only have release notes for 2.3 itself, not for the to-be-planned point release, and it's a bit over my head to update the docbook pipeline for that.

Also, considering this doesn't include any functional changes - other than not exiting if busy, I'd argue it fixes a logic bug, rather than being a change in behaviour.

@flokli
Copy link
Contributor Author

flokli commented Oct 31, 2023

I'm offering to getting through the git log, and drafting some release notes for all of 2.3.17, once we cut it (#9244).

@Ericson2314
Copy link
Member

@flokli Figuring that out when we actually cut the release sounds good to me :)

@flokli
Copy link
Contributor Author

flokli commented Nov 1, 2023

@Ericson2314 @edolstra is this good to merge like the three others, or anything that needs to be sorted out first?

@Ericson2314
Copy link
Member

@flokli I just want to see CI pass.

@flokli
Copy link
Contributor Author

flokli commented Nov 1, 2023

Looks like macos passed this time, and the others got skipped 😆

@Ericson2314
Copy link
Member

Good, that's progress. Restarted the Linux one.

@Ericson2314 Ericson2314 merged commit f769904 into NixOS:2.3-maintenance Nov 2, 2023
6 checks passed
@flokli flokli deleted the backport-3564 branch November 2, 2023 05:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants