Github Actions Workflow to keep develop synchronized with changes from master #1191
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
KartikP
requested review from
mike-ferguson
and removed request for
mike-ferguson
|
Promise this is my last trigger. |
KartikP
requested review from
samwinebrake
and removed request for
mike-ferguson
|
Swapped out rebase with merge. |
samwinebrake
approved these changes
Aug 27, 2024
KartikP
added a commit
that referenced
this pull request
Aug 29, 2024
* remove old tutorials in favor of new link (#1170) * Fixing a detail in pyprojecct.toml that surfaced while running the quickstart tutorial. (#1192) * add eBarlow_lmda_02_1000ep to models (#1200) Co-authored-by: AutoJenkins <[email protected]> * add developer doc notes (#1201) * add developer doc notes * update version number * Github Actions Workflow to keep develop synchronized with changes from master (#1191) * Added branch sync workflow. * Swapped rebase with merge. Added some push error handling in autosync. * Swapped rebase with merge. Added some push error handling in autosync. * update theme to match language (#1204) --------- Co-authored-by: Michael Ferguson <[email protected]> Co-authored-by: jimn2 <[email protected]> Co-authored-by: Katherine Fairchild <[email protected]> Co-authored-by: AutoJenkins <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Trigger conditions is when any PR targeting
masteris closed. Additional trigger to determine if web submission PR (forauto_sync...) or not a web submission PR (forcreate_pr...).create_pr_for_nonpluginwill create a PR to synchronize master to develop.auto_sync_for_pluginwill attempt to automatically merge thedevelopbranch ontomasterbranch and then pushes changes todevelop. If unsuccessful, a PR will be created to address the merge conflict.This workflow does not contain steps that push or merge changes back onto the
masterbranch and all actions are performed ondevelopso there should be no unintended changes tomaster