Diff against branch in pending PR #13
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
We've been diffing against the downstream main branch, which creates an incentive to merge upstream template PRs expeditiously to keep the diff clean. However, it also adds noise to the downstream Git history. It'd be better to let changes accumulate in a PR, and merge it just before starting a release. Add tmpl8 command-line options allowing it to sync the cache (and thus generate the diff) from the downstream PR branch instead. If that branch is missing, fall back to the downstream main branch as before. This is implemented via a regex and replacement string for repo URLs and a single branch name for all repos, since that's all we actually need right now. Hardcode arguments in the Makefile to match the values used by the GitHub workflow.
jlebon
approved these changes
Jul 11, 2022
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.
We've been diffing against the downstream main branch, which creates an incentive to merge upstream template PRs expeditiously to keep the diff clean. However, it also adds noise to the downstream Git history. It'd be better to let changes accumulate in a PR, and merge it just before starting a release.
Add tmpl8 command-line options allowing it to sync the cache (and thus generate the diff) from the downstream PR branch instead. If that branch is missing, fall back to the downstream main branch as before. This is implemented via a regex and replacement string for repo URLs and a single branch name for all repos, since that's all we actually need right now.
Hardcode arguments in the Makefile to match the values used by the GitHub workflow.