Skip to content

Commit

Permalink
scripts: adapt bump-pebble.sh for removal of vendor
Browse files Browse the repository at this point in the history
Remove all references to the vendor directory in the bump-pebble
script.

Release note: None
Epic: None
  • Loading branch information
jbowens committed Dec 19, 2022
1 parent c88b6ea commit e49ed89
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions scripts/bump-pebble.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ popd

COCKROACH_BRANCH="$USER/pebble-${BRANCH}-${NEW_SHA:0:12}"

# Pull in the Pebble module at the desired SHA and rebuild the vendor
# directory.
# Pull in the Pebble module at the desired SHA.
pushd "$COCKROACH_DIR"
go get "github.com/cockroachdb/pebble@${NEW_SHA}"
go mod tidy
Expand All @@ -83,10 +82,9 @@ popd
pushd "$COCKROACH_DIR"
./dev generate bazel --mirror
git add go.mod go.sum DEPS.bzl build/bazelutil/distdir_files.bzl
git add vendor
git branch -D "$COCKROACH_BRANCH" || true
git checkout -b "$COCKROACH_BRANCH"
git commit -m "vendor: bump Pebble to ${NEW_SHA:0:12}
git commit -m "go.mod: bump Pebble to ${NEW_SHA:0:12}
$COMMITS
Expand Down

0 comments on commit e49ed89

Please sign in to comment.