Skip to content

Commit 29d4e7f

Browse files
committed
Makefile: rework bootstrap
`gem install bundler` only needs to be run if `vendor` doesn't exist. `bundle install` should be run whenever `Gemfile` OR `Gemfile.lock` changes.
1 parent ea661ef commit 29d4e7f

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

Makefile

+3-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,9 @@ test: bootstrap
6464
go get -u github.com/cockroachdb/htmltest
6565
htmltest
6666

67-
bootstrap: Gemfile.lock
67+
vendor:
6868
gem install bundler
69+
70+
bootstrap: Gemfile Gemfile.lock vendor
6971
bundle install
7072
touch $@

ci/publish

+1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ run() {
1212

1313
# Tell the Makefile we've already installed dependencies.
1414
touch "$root/../bootstrap"
15+
touch "$root/../vendor"
1516

1617
run make standard-build managed-build

ci/pull-request

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ baseurl=$BUILD_VCS_NUMBER
1212

1313
# Tell the Makefile we've already installed dependencies.
1414
touch bootstrap
15+
touch vendor
1516

1617
# Step 1. Build the standard docs.
1718
cat > _config_prod.yml <<EOF
@@ -39,7 +40,7 @@ COMMENT_BODY=$(
3940
git diff --name-status $(git merge-base HEAD origin/master) | \
4041
awk -v "base_url=http://cockroach-docs-review.s3-website-us-east-1.amazonaws.com/$BUILD_VCS_NUMBER/" '
4142
BEGIN {
42-
print "Online preview: " base_url
43+
print "Online preview: " base_url
4344
}
4445
4546
/^[AM]\s+[^_].*\.(md|html)/ {

0 commit comments

Comments
 (0)