Skip to content

Commit

Permalink
Merge pull request #52446 from jlinder/backport19.2-52265-52311
Browse files Browse the repository at this point in the history
release-19.2: build: ask tar to read to end
  • Loading branch information
jlinder authored Aug 6, 2020
2 parents ae47b5e + 14d8a73 commit 69cd5b4
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion build/release/teamcity-make-and-publish-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,9 @@ docker_login_with_google
gcr_repository="us.gcr.io/cockroach-cloud-images/cockroach"

# TODO: update publish-provisional-artifacts with option to leave one or more cockroach binaries in the local filesystem
curl -f -s -S -o- "https://${bucket}.s3.amazonaws.com/cockroach-${build_name}.linux-amd64.tgz" | tar xfz - --strip-components 1
# NB: tar usually stops reading as soon as it sees an empty block but that makes
# curl unhappy, so passing `i` will cause it to read to the end.
curl -f -s -S -o- "https://${bucket}.s3.amazonaws.com/cockroach-${build_name}.linux-amd64.tgz" | tar ixfz - --strip-components 1
cp cockroach build/deploy/cockroach

docker build --no-cache --tag="${gcr_repository}:${build_name}" build/deploy
Expand Down

0 comments on commit 69cd5b4

Please sign in to comment.