Skip to content

Commit

Permalink
Merge pull request #41994 from bobvawter/backport19.2-41993
Browse files Browse the repository at this point in the history
release-19.2: build: Upgrade to go 1.12.12

Manually merging, per discussion with @petermattis
  • Loading branch information
bobvawter authored Oct 30, 2019
2 parents 141b151 + e3315fa commit 262e6f2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build/bootstrap/bootstrap-debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ echo '. ~/.bashrc_bootstrap' >> ~/.bashrc

# Install Go.
trap 'rm -f /tmp/go.tgz' EXIT
curl https://dl.google.com/go/go1.12.10.linux-amd64.tar.gz > /tmp/go.tgz
curl https://dl.google.com/go/go1.12.12.linux-amd64.tar.gz > /tmp/go.tgz
sha256sum -c - <<EOF
aaa84147433aed24e70b31da369bb6ca2859464a45de47c2a5023d8573412f6b /tmp/go.tgz
4cf11ac6a8fa42d26ab85e27a5d916ee171900a87745d9f7d4a29a21587d78fc /tmp/go.tgz
EOF
sudo tar -C /usr/local -zxf /tmp/go.tgz

Expand Down
2 changes: 1 addition & 1 deletion build/builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -euo pipefail

image=cockroachdb/builder
version=20191014-135449
version=20191029-105705

function init() {
docker build --tag="${image}" "$(dirname "${0}")/builder"
Expand Down
4 changes: 2 additions & 2 deletions build/builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,8 @@ RUN git clone git://git.sv.gnu.org/sed \
# releases of Go will no longer be run in CI once it is changed. Consider
# bumping the minimum allowed version of Go in /build/go-version-chech.sh.
RUN apt-get install -y --no-install-recommends golang \
&& curl -fsSL https://storage.googleapis.com/golang/go1.12.10.src.tar.gz -o golang.tar.gz \
&& echo 'f56e48fce80646d3c94dcf36d3e3f490f6d541a92070ad409b87b6bbb9da3954 golang.tar.gz' | sha256sum -c - \
&& curl -fsSL https://storage.googleapis.com/golang/go1.12.12.src.tar.gz -o golang.tar.gz \
&& echo 'fcb33b5290fa9bcc52be3211501540df7483d7276b031fc77528672a3c705b99 golang.tar.gz' | sha256sum -c - \
&& tar -C /usr/local -xzf golang.tar.gz \
&& rm golang.tar.gz \
&& cd /usr/local/go/src \
Expand Down

0 comments on commit 262e6f2

Please sign in to comment.