-
Notifications
You must be signed in to change notification settings - Fork 0
Periodically rebase firebase-cpp-sdk with upstream #40
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
Periodically rebase firebase-cpp-sdk with upstream #40
Conversation
fd7c2e8 to
3b56f37
Compare
tristanlabelle
left a comment
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.
This is so cool! You should share it with eng-platform-infra :).
What's the flow to handle rebase failures? Once we have one conflicting commit in our history, will all subsequent rebases fail?
compnerd
left a comment
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.
Nice! This seems like the right approach. I still think that there is some value in compressing all the CI changes that we have as their history doesn't actually give us anything.
Agreed! Let's talk about this today: We can either squash the changes periodically, or I can add a parameter to the gha-sync-fork workflow that attempts to do it automatically every time we sync.
Yep, and someone will have to fix the conflict to get this job to succeed again. let's also talk about this today too. We could have some alerting if needed, but I'd like to hear how everyone thinks that alerting should work, and any other ideas we may have. |
Co-authored-by: kendal <kendal@thebrowser.company>
Co-authored-by: kendal <kendal@thebrowser.company>
Co-authored-by: kendal <kendal@thebrowser.company>
Co-authored-by: kendal <kendal@thebrowser.company>
Co-authored-by: kendal <kendal@thebrowser.company>
Co-authored-by: kendal <kendal@thebrowser.company>
Co-authored-by: kendal <kendal@thebrowser.company>
Co-authored-by: kendal <kendal@thebrowser.company>
Co-authored-by: kendal <kendal@thebrowser.company>
Co-authored-by: kendal <kendal@thebrowser.company>
Co-authored-by: kendal <kendal@thebrowser.company>
Co-authored-by: kendal <kendal@thebrowser.company>
Description
This workflow runs
thebrowsercompany/gha-sync-forkat 8 am every day.It can also be triggered manually using:
Or by clicking the "Sync this Fork" button in the GitHub UI.
Testing
See this workflow run: https://github.com/thebrowsercompany/firebase-cpp-sdk/actions/runs/9104534949