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

🐛 (svg tester) fix actions when running in parallel #3276

Merged
merged 1 commit into from
Mar 13, 2024

Conversation

sophiamersmann
Copy link
Member

@sophiamersmann sophiamersmann commented Mar 1, 2024

Problem

  • Both actions commit and force-push changes to master
  • As a result, the last push wins and overwrites the commit of the sibling action

Solution

  • Rather than directly committing to master, the actions create a temporary branch called master__<unix timestamp> and force-push to that branch
  • If there are differences, we want to merge the temporary branch into master
  • To do so, we switch to master, pull its current version from remote, merge the temporary branch, and force-push the result
    • If we do get a merge conflict, it's automatically resolved by keeping their version, i.e. the version of the temporary branch the contains the differences

Copy link
Member Author

sophiamersmann commented Mar 1, 2024

This stack of pull requests is managed by Graphite. Learn more about stacking.

Join @sophiamersmann and the rest of your teammates on Graphite Graphite

@sophiamersmann sophiamersmann force-pushed the fix-svg-tester-action branch 6 times, most recently from a9dc043 to 10e9354 Compare March 4, 2024 10:50
@sophiamersmann sophiamersmann marked this pull request as ready for review March 4, 2024 11:15
@sophiamersmann sophiamersmann changed the title fix svg tester actions when running in parallel 🐛 (svg tester) fix actions when running in parallel Mar 4, 2024
@sophiamersmann sophiamersmann force-pushed the fix-svg-tester-action branch 3 times, most recently from dfc3949 to be30643 Compare March 6, 2024 14:45
@sophiamersmann sophiamersmann requested a review from danyx23 March 6, 2024 15:04
Copy link
Contributor

@danyx23 danyx23 left a comment

Choose a reason for hiding this comment

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

Looks good! 🤞

@sophiamersmann sophiamersmann force-pushed the fix-svg-tester-action branch from be30643 to f811ff3 Compare March 13, 2024 17:01
@sophiamersmann sophiamersmann merged commit 5eaa288 into master Mar 13, 2024
28 of 30 checks passed
@sophiamersmann sophiamersmann deleted the fix-svg-tester-action branch March 13, 2024 17:28
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.

2 participants