scripts: per-branch bump-pebble.sh script #75908
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
Currently, the master branch, in addition to each release branch relies on the same `bump-pebbble.sh` from the master branch. There are subtle differences between master and the release branches (i.e. build system) that ends up breaking the script as the changes are introduced on the master branch but not backported to the release branches. One solution to this problem is to continue to maintain one script on the master branch, but include switching logic for each release branch to account for the differences. An alternative approach is to have a script per release branch. Rather than having switching logic, the script has the appropriate logic for that branch. When a new release branch is cut, the script inherits the most up-to-date logic from master, and all that needs to change is the name of the branch and the corresponding Pebble branch. Pin the `bump-pebble.sh` script to the master branch. The script will error out if it is run from a different branch. Release note: None
|
This change is |
nicktrav
added a commit
to nicktrav/cockroach
that referenced
this pull request
Feb 3, 2022
This is the `release-21.1` variant of cockroachdb#75908. Release note: None
nicktrav
added a commit
to nicktrav/cockroach
that referenced
this pull request
Feb 3, 2022
This is the release-21.2 variant of cockroachdb#75908. Release note: None
jbowens
approved these changes
Feb 3, 2022
There was a problem hiding this comment.
Reviewed 1 of 1 files at r1, all commit messages.
Reviewable status:complete! 0 of 0 LGTMs obtained (waiting on @nicktrav)
|
TFTR! bors r=jbowens |
|
Build failed: |
|
bors retry |
|
Build succeeded: |
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.
Currently, the master branch, in addition to each release branch relies
on the same
bump-pebbble.shfrom the master branch. There are subtledifferences between master and the release branches (i.e. build system)
that ends up breaking the script as the changes are introduced on the
master branch but not backported to the release branches.
One solution to this problem is to continue to maintain one script on
the master branch, but include switching logic for each release branch
to account for the differences.
An alternative approach is to have a script per release branch. Rather
than having switching logic, the script has the appropriate logic for
that branch. When a new release branch is cut, the script inherits the
most up-to-date logic from master, and all that needs to change is the
name of the branch and the corresponding Pebble branch.
Pin the
bump-pebble.shscript to the master branch. The script willerror out if it is run from a different branch.
Release note: None