Skip to content

Commit

Permalink
builder: upgrade to go1.12.5
Browse files Browse the repository at this point in the history
Release note (general change): Upgrade the build environment to use
go1.12.5.
  • Loading branch information
petermattis committed Jun 4, 2019
1 parent 5a17b3d commit d0b7737
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
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=20190318-200038
version=20190601-131333

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.11.6.src.tar.gz -o golang.tar.gz \
&& echo 'a96da1425dcbec094736033a8a416316547f8100ab4b72c31d4824d761d3e133 golang.tar.gz' | sha256sum -c - \
&& curl -fsSL https://storage.googleapis.com/golang/go1.12.5.src.tar.gz -o golang.tar.gz \
&& echo '2aa5f088cbb332e73fc3def546800616b38d3bfe6b8713b8a6404060f22503e8 golang.tar.gz' | sha256sum -c - \
&& tar -C /usr/local -xzf golang.tar.gz \
&& rm golang.tar.gz \
&& cd /usr/local/go/src \
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/log/clog.go
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ type EntryDecoder struct {

// NewEntryDecoder creates a new instance of EntryDecoder.
func NewEntryDecoder(in io.Reader) *EntryDecoder {
d := &EntryDecoder{scanner: bufio.NewScanner(in), re: entryRE.Copy()}
d := &EntryDecoder{scanner: bufio.NewScanner(in), re: entryRE}
d.scanner.Split(d.split)
return d
}
Expand Down

0 comments on commit d0b7737

Please sign in to comment.