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

Add sync-upstream workflows #7

Merged
merged 106 commits into from
Jun 21, 2024
Merged

Add sync-upstream workflows #7

merged 106 commits into from
Jun 21, 2024

Conversation

guicaulada
Copy link
Collaborator

@guicaulada guicaulada commented Jun 10, 2024

I think I'm in a good position with the sync workflow now, it needs some love fixing versions, removing test steps, etc. I expect a lot of feedback from the team to improve it. But I think the approach is good now.

We have 3 workflows:

  • One responsible for creating the PR with the upstream changes.
    Currently running on my pull request on changes, in the future it will run on a cron or manually.
  • One responsible for updating the PR, in case there are changes on main that weren't included on the PR we can request changes and the bot will rebase the latest main and update the PR.
  • One responsible for pushing the changes to main, once the PR is approved the bot will try to push the changes to main.

I tried to merge the last 2 workflows but if we rebased just before pushing the changes from the latest rebase wouldn't be reviewed and conflicts could be caused.

If there are conflicts the PR should be created anyway, I don't know if we can create a empty PR but if we can't I will make a dummy commit just to create the PR and will advise on the body on how to proceed to rebase without the dummy commit.

There are a couple pull requests from the bot so you can see how they look, one of them simulates conflicts, the other doesn't:
https://github.com/grafana/runner-images/pulls

ghost pushed a commit that referenced this pull request Jun 14, 2024
ghost pushed a commit that referenced this pull request Jun 14, 2024
ghost pushed a commit that referenced this pull request Jun 14, 2024
ghost pushed a commit that referenced this pull request Jun 14, 2024
ghost pushed a commit that referenced this pull request Jun 14, 2024
ghost pushed a commit that referenced this pull request Jun 14, 2024
ghost pushed a commit that referenced this pull request Jun 14, 2024
ghost pushed a commit that referenced this pull request Jun 14, 2024
ghost pushed a commit that referenced this pull request Jun 14, 2024
@ghost ghost mentioned this pull request Jun 14, 2024
@ghost ghost force-pushed the gc/sync-upstream branch from db02eb3 to 48cc70a Compare June 14, 2024 19:13
@CLAassistant
Copy link

CLAassistant commented Jun 14, 2024

CLA assistant check
All committers have signed the CLA.

ghost pushed a commit that referenced this pull request Jun 14, 2024
ghost pushed a commit that referenced this pull request Jun 14, 2024
@ghost ghost mentioned this pull request Jun 14, 2024
ghost pushed a commit that referenced this pull request Jun 14, 2024
ghost pushed a commit that referenced this pull request Jun 14, 2024
ghost pushed a commit that referenced this pull request Jun 14, 2024
ghost pushed a commit that referenced this pull request Jun 14, 2024
@guicaulada guicaulada requested a review from a team June 17, 2024 17:05
Copy link

@dsotirakis dsotirakis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good job! A few questions mostly for my understanding of things

.github/workflows/sync-upstream-pr.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-pr.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-pr.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-push.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-push.yml Outdated Show resolved Hide resolved
@guicaulada guicaulada requested a review from iainlane June 19, 2024 17:22
Copy link
Member

@iainlane iainlane left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

great, this is looking good 👍

mostly have smaller comments and questions now 😁

.github/workflows/sync-upstream-push.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-create.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-create.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-create.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-push.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-push.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-change.yml Show resolved Hide resolved
.github/workflows/sync-upstream-change.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-push.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-change.yml Outdated Show resolved Hide resolved
Co-authored-by: Iain Lane <iain@orangesquash.org.uk>
github-actions bot added a commit that referenced this pull request Jun 20, 2024
github-actions bot added a commit that referenced this pull request Jun 20, 2024
github-actions bot added a commit that referenced this pull request Jun 20, 2024
github-actions bot added a commit that referenced this pull request Jun 20, 2024
github-actions bot added a commit that referenced this pull request Jun 20, 2024
github-actions bot added a commit that referenced this pull request Jun 20, 2024
Copy link
Member

@iainlane iainlane left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks great, just some tiny nits 👍 🚀 🥳 🎈 🎆

.github/workflows/sync-upstream-create.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-change.yml Outdated Show resolved Hide resolved
.github/workflows/sync-upstream-merge.yml Outdated Show resolved Hide resolved
Co-authored-by: Iain Lane <iain@orangesquash.org.uk>
github-actions bot added a commit that referenced this pull request Jun 21, 2024
github-actions bot added a commit that referenced this pull request Jun 21, 2024
@guicaulada guicaulada changed the title Add sync-upstream.yml workflow Add sync-upstream workflows Jun 21, 2024
@guicaulada guicaulada merged commit 2488b9a into main Jun 21, 2024
3 checks passed
@guicaulada guicaulada deleted the gc/sync-upstream branch June 21, 2024 14:25
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.

4 participants