-
Notifications
You must be signed in to change notification settings - Fork 0
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
Conversation
41d396b
to
00e57a6
Compare
2104fe9
to
8984b0a
Compare
48cc70a
to
c1bf5e9
Compare
There was a problem hiding this 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
There was a problem hiding this 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 😁
Co-authored-by: Iain Lane <iain@orangesquash.org.uk>
There was a problem hiding this 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 👍 🚀 🥳 🎈 🎆
Co-authored-by: Iain Lane <iain@orangesquash.org.uk>
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:
Currently running on my pull request on changes, in the future it will run on a cron or manually.
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