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

Fix automation error with back-to-back commits #9

Merged
merged 3 commits into from
Jun 30, 2021
Merged

Conversation

eito-fis
Copy link
Contributor

Fixes mathesar-foundation/mathesar#309

Updates the github actions with Cancel Workflow Action, which causes new commits to cancel old ones. As a result, any actions running on a commit which would cause a conflict should be cancelled. As a safety net, we also git pull before pushing, exiting if there are merge errors.

@eito-fis eito-fis changed the title Fix automatin error with back-to-back commits Fix automation error with back-to-back commits Jun 30, 2021
Copy link
Contributor

@kgodey kgodey 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, thanks!

@kgodey kgodey merged commit ef2d7a2 into master Jun 30, 2021
@kgodey kgodey deleted the fix_multi_commit branch June 30, 2021 19:36
kgodey added a commit that referenced this pull request Oct 28, 2021
Fix automation error with back-to-back commits
kgodey added a commit that referenced this pull request Oct 28, 2021
Fix automation error with back-to-back commits
kgodey added a commit that referenced this pull request Oct 30, 2021
Fix automation error with back-to-back commits
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.

[Wiki] Multiple commits at the same time break image automation
2 participants