Skip to content

Commit

Permalink
Update to go1.12
Browse files Browse the repository at this point in the history
Uses go1.12 to build. Something about the release changed causing
us to have to manually set `CGO_ENABLED=0` when running vet/test.

Fixes #610

Signed-off-by: John Schnake <[email protected]>
  • Loading branch information
johnSchnake committed Feb 27, 2019
1 parent 2898340 commit 60e9447
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: required
language: go
go:
- "1.10"
- "1.12"

services:
- docker
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ ifneq ($(VERBOSE),)
VERBOSE_FLAG = -v
endif
BUILDMNT = /go/src/$(GOTARGET)
BUILD_IMAGE ?= golang:1.10-alpine
BUILD_IMAGE ?= golang:1.12.0-alpine3.9

TESTARGS ?= $(VERBOSE_FLAG) -timeout 60s
TEST_PKGS ?= $(GOTARGET)/cmd/... $(GOTARGET)/pkg/...
Expand Down Expand Up @@ -74,17 +74,17 @@ local-test:

# Unit tests
test: sonobuoy vet
$(DOCKER_BUILD) '$(TEST)'
$(DOCKER_BUILD) 'CGO_ENABLED=0 $(TEST)'

# Integration tests
int: sonobuoy
$(DOCKER_BUILD) '$(INT_TEST)'
$(DOCKER_BUILD) 'CGO_ENABLED=0 $(INT_TEST)'

lint:
$(DOCKER_BUILD) '$(LINT)'

vet:
$(DOCKER_BUILD) '$(VET)'
$(DOCKER_BUILD) 'CGO_ENABLED=0 $(VET)'

pre:
go get github.com/estesp/manifest-tool
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ records the following results:

### CLI Prerequisites

* Golang installed. We recommend [gimme][gimme], with golang version 1.10.4.
* Golang installed. We recommend [gimme][gimme], with golang version 1.12.0.

* Your $PATH configured:

Expand Down

0 comments on commit 60e9447

Please sign in to comment.