Skip to content

Conversation

@kendalharland
Copy link
Member

@kendalharland kendalharland commented May 16, 2024

Description

This workflow runs thebrowsercompany/gha-sync-fork at 8 am every day.

It can also be triggered manually using:

gh workflow run 'cron-sync-with-upstream.yml' -R thebrowsercompany/firebase-cpp-sdk

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

@kendalharland kendalharland force-pushed the kendal/devin-1140-auto-rebase-firebase-cpp-sdk-with-upstream-periodically branch from fd7c2e8 to 3b56f37 Compare May 16, 2024 00:38
@kendalharland kendalharland changed the title Kendal/devin 1140 auto rebase firebase cpp sdk with upstream periodically Periodically rebase firebase-cpp-sdk with upstream May 16, 2024
Copy link

@tristanlabelle tristanlabelle left a 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?

Copy link
Collaborator

@compnerd compnerd left a 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.

@kendalharland
Copy link
Member Author

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.

What's the flow to handle rebase failures? Once we have one conflicting commit in our history, will all subsequent rebases fail?

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.

@kendalharland kendalharland merged commit fafd54e into compnerd/swift May 16, 2024
@kendalharland kendalharland deleted the kendal/devin-1140-auto-rebase-firebase-cpp-sdk-with-upstream-periodically branch May 16, 2024 16:33
bcny-fork-syncer bot pushed a commit that referenced this pull request May 25, 2024
Co-authored-by: kendal <kendal@thebrowser.company>
bcny-fork-syncer bot pushed a commit that referenced this pull request May 31, 2024
Co-authored-by: kendal <kendal@thebrowser.company>
bcny-fork-syncer bot pushed a commit that referenced this pull request Jun 1, 2024
Co-authored-by: kendal <kendal@thebrowser.company>
bcny-fork-syncer bot pushed a commit that referenced this pull request Jun 7, 2024
Co-authored-by: kendal <kendal@thebrowser.company>
bcny-fork-syncer bot pushed a commit that referenced this pull request Jul 16, 2024
Co-authored-by: kendal <kendal@thebrowser.company>
bcny-fork-syncer bot pushed a commit that referenced this pull request Jul 18, 2024
Co-authored-by: kendal <kendal@thebrowser.company>
bcny-fork-syncer bot pushed a commit that referenced this pull request Aug 3, 2024
Co-authored-by: kendal <kendal@thebrowser.company>
bcny-fork-syncer bot pushed a commit that referenced this pull request Aug 6, 2024
Co-authored-by: kendal <kendal@thebrowser.company>
bcny-fork-syncer bot pushed a commit that referenced this pull request Aug 21, 2024
Co-authored-by: kendal <kendal@thebrowser.company>
bcny-fork-syncer bot pushed a commit that referenced this pull request Sep 7, 2024
Co-authored-by: kendal <kendal@thebrowser.company>
bcny-fork-syncer bot pushed a commit that referenced this pull request Sep 11, 2024
Co-authored-by: kendal <kendal@thebrowser.company>
bcny-fork-syncer bot pushed a commit that referenced this pull request Sep 12, 2024
Co-authored-by: kendal <kendal@thebrowser.company>
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.

5 participants