Add GitHub Actions workflow for syncing upstream repository#18
Open
yousef-cohere wants to merge 5 commits into
Open
Add GitHub Actions workflow for syncing upstream repository#18yousef-cohere wants to merge 5 commits into
yousef-cohere wants to merge 5 commits into
Conversation
- Introduced a new workflow `sync-upstream.yaml` that automates the process of syncing the main branch with an upstream repository on a scheduled basis and via manual triggers. - The workflow includes steps for fast-forwarding the main branch, checking for updates on the cohere branch, and creating pull requests for any new commits. - Enhanced error handling for merge conflicts and provided detailed instructions for conflict resolution in the generated pull requests.
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
- Updated `sync-upstream.yaml` to deny all permissions at the workflow level, requiring explicit opt-in for jobs. - Implemented concurrency control to prevent overlapping sync workflows. - Enhanced security by ensuring the GITHUB_TOKEN is not persisted in the git configuration. - Improved error handling and clarity in the fast-forwarding and merging processes, including better management of merge conflicts. - Updated action versions for consistency and reliability.
- Added a temporary push trigger for the `feat/sync-upstream-workflow` branch to facilitate testing before merging. - Maintained the existing scheduled sync functionality for the main branch.
- Updated `sync-upstream.yaml` to explicitly set the GITHUB_TOKEN environment variable, enhancing security by preventing token persistence in git configuration. - Simplified the push command by removing the extraheader for authentication, streamlining the push process. - Added comments for clarity regarding token handling and configuration steps.
Made-with: Cursor
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 5b75df5. Configure here.
| # TEMPORARY: testing on feature branch — remove before merging to cohere. | ||
| push: | ||
| branches: | ||
| - feat/sync-upstream-workflow |
There was a problem hiding this comment.
Temporary push trigger left in workflow file
Medium Severity
The push trigger on branch feat/sync-upstream-workflow is annotated with a comment explicitly stating it's "TEMPORARY: testing on feature branch — remove before merging to cohere." This debug trigger is still present and will cause the full sync workflow (including pushes to main and PR creation) to run on every push to that feature branch, and it will remain active after merging unless removed.
Reviewed by Cursor Bugbot for commit 5b75df5. Configure here.
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
2 participants
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.
sync-upstream.yamlthat automates the process of syncing the main branch with an upstream repository on a scheduled basis and via manual triggers.Note
Medium Risk
This introduces automation that can directly push to
mainand create PRs, so misconfiguration or unexpected upstream changes could affect the primary branch even though the fast-forward-only guardrails reduce risk.Overview
Adds a new GitHub Actions workflow,
sync-upstream.yaml, to automate syncingmainwithconfidential-containers/cloud-api-adaptoron a weekly cron and via manual dispatch (with configurable upstream ref and target cohere branch).The workflow fast-forwards
origin/mainonly when it’s strictly behind upstream (fails ifmainhas diverged), then creates/pushes async/upstream-<date>-<sha>branch and opens a PR to merge intocohere, including conflict detection and tailored PR instructions when conflicts are found.Reviewed by Cursor Bugbot for commit 5b75df5. Bugbot is set up for automated code reviews on this repo. Configure here.