Merge next into master
#198
Merged
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
* Remove `manual_merge` input, only do it as a fallback * Delete disabled test cases * Update README
* Refactor output exports * Add output tests
#191) * Add method for determining the ideal default clone depth based if the user does not specify it * Fix failing unit tests * write tests for new method * Default to shallow clone depth for all merge methods except manual merge * Specify clone_depth for generate-changelog e2e tests * Fix git commit count * Update CLONE_DEPTH values in e2e tests to verify they're actually working
* Use PR head ref in output export * Remove unused parameter * Fix constructor * Define head ref in E2E tests
* Disable git GC before fetch * Print failed command output too * Reorder commands * Use standard runner for the git config command
* Reorder inputs and categories * Remove category of merge_pr
* Remove PR ID input * Remove input from config too
* Reorder inputs and categories * Remove category of merge_pr * Remove PR ID input * Remove input from config too * Better step input descriptions * YAML lint * Reorder inputs and categories (#195) * Reorder inputs and categories * Remove category of merge_pr * Remove PR ID input (#196) * Remove PR ID input * Remove input from config too * Reorder inputs and categories * Fix step.yml after broken merge resolution * Remove category * Revert accidentally readded step input
lpusok
approved these changes
Jan 2, 2023
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.
Checklist
step.ymlandREADME.mdis updated with the changes (if needed)Version
Requires a MAJOR version update
Context
This PR just merges the special branch
nextinto the main branch. We were opening PRs with breaking changes against thenextbranch in order to unblock a potential hotfix release on the main branch.The plan is to merge this PR as a rebase merge (instead of the usual squash merge) to keep the commit history of the main branch clean.
Changes
See each commit and the related PR.
List of breaking changes
To mention in the release notes:
manual_mergeinput, only do it as a fallback #188: Removemanual_mergeinputmanual_mergeinput, only do it as a fallback #188 and Add method for determining the ideal default clone depth based if the… #191: By default, the step will shallow-fetch the merge ref of a PR (if available) instead of fetching the entire history and doing the merge manually. This only applies ifmerge_pris set toyes(the default)GIT_CLONE_COMMIT_COMMITTER_NAME,GIT_CLONE_COMMIT_COMMITTER_EMAILPR_IDinputInvestigation details
Decisions