Skip to content
This repository was archived by the owner on Feb 1, 2023. It is now read-only.

Commit f417856

Browse files
authored
Bump to golang v1.11 (#59)
1 parent 7b28b17 commit f417856

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ stages:
1010

1111
steps:
1212
- run: sudo rm -rf /usr/local/go &&
13-
wget -q -O /tmp/golang.tgz https://dl.google.com/go/go1.10.linux-amd64.tar.gz &&
13+
wget -q -O /tmp/golang.tgz https://dl.google.com/go/go1.11.linux-amd64.tar.gz &&
1414
sudo tar -C /usr/local -xzf /tmp/golang.tgz
1515

1616
- run: mkdir -p ~/go/src/github.com/drud/build-tools && mkdir -p ~/go/lib && mkdir -p ~/go/bin

makefile_components/base_build_go.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ GOFILES = $(shell find $(SRC_DIRS) -name "*.go")
1414

1515
BUILD_OS = $(shell go env GOHOSTOS)
1616

17-
BUILD_IMAGE ?= drud/golang-build-container:v1.10.3
17+
BUILD_IMAGE ?= drud/golang-build-container:v1.11
1818

1919
BUILD_BASE_DIR ?= $$PWD
2020

tests/pkg/clean/build_tools_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -277,12 +277,13 @@ func TestGolangciLint(t *testing.T) {
277277
// Test "make gometalinter"
278278
v, err := exec.Command("make", "golangci-lint").Output()
279279
a.Error(err) // Should complain about pretty much everything in the dirtyComplex package.
280-
a.Contains(string(v), "don't use MixedCaps in package name; dirtyComplex should be dirtycomplex")
281-
a.Contains(string(v), "don't use underscores in Go names; func DummyExported_function should be DummyExportedFunction (golint)")
282-
a.Contains(string(v), "File is not gofmt-ed with -s (gofmt)")
283-
a.Contains(string(v), "ineffectual assignment to `num` (ineffassign)")
284-
a.Contains(string(v), "yetAnotherExportedFunction` is unused (deadcode)")
285-
a.Contains(string(v), "Error return value of `os.Chown` is not checked (errcheck)")
280+
execResult := string(v)
281+
a.Contains(execResult, "don't use MixedCaps in package name; dirtyComplex should be dirtycomplex")
282+
a.Contains(execResult, "don't use underscores in Go names; func DummyExported_function should be DummyExportedFunction (golint)")
283+
a.Contains(execResult, "File is not `gofmt`-ed with `-s`")
284+
a.Contains(execResult, "ineffectual assignment to `num` (ineffassign)")
285+
a.Contains(execResult, "yetAnotherExportedFunction` is unused (deadcode)")
286+
a.Contains(execResult, "Error return value of `os.Chown` is not checked (errcheck)")
286287

287288
out, err := exec.Command("make", "golangci-lint", "SRC_DIRS=pkg/clean").Output()
288289
a.NoError(err, "Failed to get clean result for golangci-lint: %v (output=%s)", err, out) // Should have no complaints in clean package

0 commit comments

Comments
 (0)