Repository navigation
Conversation
We want it ready on the morning of a weekday. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Periodically doing this in the remote repo has proven unreliable. Let's do it less frequently, just as needed, from the update job that consumes the repo. This job runs on the CNCF runners too, which will hopefully be more reliable. Modifying the remote repo requires authentication, which is handled by the new Flatcar Hub Automation app. Note that this was entirely written by Copilot. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
No active review issues are reported for the fork-synchronization workflow changes.
No open issues 🎉
What changed in this PR
Moves Gentoo fork synchronization into the scripts workflow that consumes it, replacing reliance on periodic synchronization in the remote repository.
Changes:
- Adds GitHub App authentication and synchronizes the fork before updating the submodule.
- Adds tracking-branch rebasing with history deepening, conflict handling, and lease-protected pushes.
- Changes the schedule to Monday–Friday and passes the synchronized commit to the submodule-update job.
| File | Description |
|---|---|
.github/workflows/update-gentoo-submodule.yaml |
Coordinates authenticated fork synchronization, rebasing, and the submodule update PR. |
.github/workflows/rebase-gentoo.sh |
Rebases tracking branches and exports the upstream commit for the submodule update. |
Review effort: Balanced
This branch is waiting to be deployed
This file contains hidden or 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
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.
Periodically doing this in the remote repo has proven unreliable. Let's do it less frequently, just as needed, from the update job that consumes the repo. This job runs on the CNCF runners too, which will hopefully be more reliable.
Modifying the remote repo requires authentication, which is handled by the new Flatcar Hub Automation app. This app is really nothing more than a private key with the permission to push to flatcar-hub/gentoo. I have added the private key as a flatcar organisation-wide secret, but it is still applied to just the scripts repo. This allows us to potentially use the app with other repos while keeping a single source of truth for the key.
Note that this was entirely written by Copilot.
Testing done
A manual GHA run successfully synced the fork, updated Thilo's test tracking branch, and created the scripts PR in 33 seconds!