ci/update: re-apply manual commits from open PR #2940
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Instead of comparing the nixpkgs input revision, we can re-apply any manually committed changes and then check if any files are different before pushing.
traxys
approved these changes
Jan 30, 2025
|
@mergify queue |
✅ The pull request has been merged automaticallyThe pull request has been merged automatically at 93df574 |
|
This pull request, with head sha This pull request will be automatically closed by GitHub.As soon as GitHub detects that the sha It is possible for this pull request to remain open if this detection does not happen, this usually happens when a force-push is done on this branch |
|
That's awesome, thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Using
git cherry-pick, we can re-apply any manually committed changes in the already open PR. "Manually committed" is defined as any commit after the most recent commit authored bygithub-actions[bot].We can also check if any files have differences before pushing.
This removes the
inputs.nixpkgsrevision checking added in #2885, because the new file-differences check is simpler and more useful.A major benefit of re-applying the additional commits is that they are no longer lost when the CI force-pushes its updates.
This has been tested:
Also: the second commit fixes a bug in #2935 where the create-pr step was checking an undefined variable.