Merge main into staging #311
Merged
Conversation
This file contains hidden or 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
* Add initial workflow * Change branch for testing purposes * Troubleshooting * Switch to PR for merging * Minor change to trigger workflow * Fix workflow error * Minor change to trigger * Add some permissions for GITHUB_TOKEN * Add more permissions for GITHUB_TOKEN * Add more permissions for GITHUB_TOKEN * Workflow improvements * Fix create-pr job * Fix create-pr job again * Minor change to trigger workflow * Simplify PR branch logic * Re-add fancier BRANCH_NAME * Try different approach * Re-add some detail for PR * Switch from reset to merging for branch update * Add git config step * Uncomment merge-pr steps * Add PR number output * Fix YAML syntax * Get fancier to capture PR number * Remove original merge step and replace with peter-evans version * Change back to main branch * Change to PR branch for testing * Change back to main branch * Change to PR branch for testing * Change back to main branch * Switch to recommended gh method for merging * Change to PR branch for testing * Add steps to delete branch and split out merge steps * Simplify again and break out PR merge into separate job * Add outputs to create-pr * Add missing checkout step to merge-pr * Re-add branch delete step * Change back to main branch * Minor wording tweaks * Change back to main branch * Change to PR branch for testing * Add --allow-unrelated-histories flag * Minor change for testing * Add staging checkout * Re-add --allow-unrelated-histories * Remove extra staging checkout * Try removing local main reference * Try specifying remote * Undo experiment * Minor change for testing * Minor change for testing * Re-add --allow-unrelated-histories * Experiment with --strategy-option theirs * Simplify merge options * Re-add some merge options after testing * Experiment with --no-commit option * Remove --no-commit option * Change branch back to main * Experiment with single job to clean up CI check section * Change to PR branch for testing * Change branch back to main * Changed branch for testing * Changed branch back to main --------- Co-authored-by: Beck <164545837+validbeck@users.noreply.github.com>
|
|
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.
Automatically merge main into staging branch.