pipeline: switch to go 1.13+1.12 (#228)

.circleci/config.yml

@@ -2,8 +2,7 @@ version: 2
 jobs:
   test-install-golang-prev:
     docker:
-      - image: circleci/golang:1.10
-    working_directory: /go/src/github.com/segmentio/chamber
+      - image: circleci/golang:1.12
     steps:
       - checkout
       - run:
@@ -13,30 +12,17 @@ jobs:
 
   test-install-golang-current:
     docker:
-      - image: circleci/golang:1.11
-    working_directory: /go/src/github.com/segmentio/chamber
+      - image: circleci/golang:1.13
     steps:
       - checkout
       - run:
           name: 'Test go get install on current golang release'
           command: |
             go get -v . && chamber version
 
-  # only need this job until 1.13 is released
-  test-install-golang-1.11-GOMODULE-on:
-    docker:
-      - image: circleci/golang:1.11
-    working_directory: /go/src/github.com/segmentio/chamber
-    steps:
-      - checkout
-      - run:
-          name: 'Test go get install on golang 1.11 GO111MODULE=on'
-          command: |
-            GO111MODULE=on go get -v . && chamber version
-
   test:
     docker:
-      - image: circleci/golang:1.11
+      - image: circleci/golang:1.13
     working_directory: /go/src/github.com/segmentio/chamber
     steps:
       - checkout
@@ -59,8 +45,7 @@ jobs:
 
   dist:
     docker:
-      - image: circleci/golang:1.11
-    working_directory: /go/src/github.com/segmentio/chamber
+      - image: circleci/golang:1.13
     steps:
       - checkout
       - run:
@@ -77,8 +62,7 @@ jobs:
 
   publish-packagecloud:
     docker:
-      - image: circleci/golang:1.11
-    working_directory: /go/src/github.com/segmentio/chamber
+      - image: circleci/golang:1.13
     steps:
       - checkout
       - attach_workspace: { at: . }
@@ -98,8 +82,7 @@ jobs:
 
   publish-github:
     docker:
-      - image: circleci/golang:1.11
-    working_directory: /go/src/github.com/segmentio/chamber
+      - image: circleci/golang:1.13
     steps:
       - checkout
       - attach_workspace: { at: . }
@@ -119,7 +102,6 @@ workflows:
       - test
       - test-install-golang-prev
       - test-install-golang-current
-      - test-install-golang-1.11-GOMODULE-on
       - dist:
           # needed to ensure dist happens on tag events
           filters:

Makefile

@@ -12,7 +12,7 @@ ANALYTICS_WRITE_KEY ?=
 LDFLAGS := -ldflags='-X "main.Version=$(VERSION)" -X "main.AnalyticsWriteKey=$(ANALYTICS_WRITE_KEY)"'
 
 test:
-	GO111MODULE=on go test -mod=vendor -v ./...
+	go test -mod=vendor -v ./...
 
 all: dist/chamber-$(VERSION)-darwin-amd64 dist/chamber-$(VERSION)-linux-amd64 dist/chamber-$(VERSION)-windows-amd64.exe
 
@@ -22,17 +22,22 @@ clean:
 dist/:
 	mkdir -p dist
 
+build: chamber
+
+chamber:
+	CGO_ENABLED=0 go build -trimpath -mod=vendor $(LDFLAGS) -o $@
+
 dist/chamber-$(VERSION)-darwin-amd64: | dist/
-	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on go build -mod=vendor $(LDFLAGS) -o $@
+	GOOS=darwin GOARCH=amd64 CGO_ENABLED=0 go build -trimpath -mod=vendor $(LDFLAGS) -o $@
 
 linux: dist/chamber-$(VERSION)-linux-amd64
 	cp $^ chamber
 
 dist/chamber-$(VERSION)-linux-amd64: | dist/
-	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on go build -mod=vendor $(LDFLAGS) -o $@
+	GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -trimpath -mod=vendor $(LDFLAGS) -o $@
 
 dist/chamber-$(VERSION)-windows-amd64.exe: | dist/
-	GOOS=windows GOARCH=amd64 CGO_ENABLED=0 GO111MODULE=on go build -mod=vendor $(LDFLAGS) -o $@
+	GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -trimpath -mod=vendor $(LDFLAGS) -o $@
 
 docker-image: docker-image-$(VERSION)
 
@@ -48,4 +53,4 @@ docker-image-publish: docker-image
 	docker push segment/chamber:$(VERSION_MAJOR_MINOR)
 	docker push segment/chamber:$(VERSION_MAJOR)
 
-.PHONY: clean all linux docker-image docker-image-$(VERSION) docker-image-publish
+.PHONY: clean all linux docker-image docker-image-$(VERSION) docker-image-publish build

Makefile.tools

@@ -24,7 +24,7 @@ sha256sum-darwin:
 	brew install coreutils && ln -s $$(which gsha256sum) /usr/local/bin/sha256sum`
 
 github-release:
-	go get -u github.com/aktau/github-release
+	GO111MODULE=off go get -u github.com/aktau/github-release
 
 package_cloud:
 	gem install package_cloud

go.mod

@@ -17,3 +17,5 @@ require (
 	golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect
 	gopkg.in/segmentio/analytics-go.v3 v3.0.1
 )
+
+go 1.13

vendor/modules.txt

@@ -1,43 +1,43 @@
 # github.com/aws/aws-sdk-go v1.16.26
 github.com/aws/aws-sdk-go/aws
 github.com/aws/aws-sdk-go/aws/awserr
-github.com/aws/aws-sdk-go/aws/ec2metadata
-github.com/aws/aws-sdk-go/aws/endpoints
-github.com/aws/aws-sdk-go/aws/session
-github.com/aws/aws-sdk-go/service/s3
-github.com/aws/aws-sdk-go/service/s3/s3iface
-github.com/aws/aws-sdk-go/service/ssm
-github.com/aws/aws-sdk-go/service/ssm/ssmiface
-github.com/aws/aws-sdk-go/service/sts
-github.com/aws/aws-sdk-go/aws/credentials
-github.com/aws/aws-sdk-go/internal/sdkio
+github.com/aws/aws-sdk-go/aws/awsutil
 github.com/aws/aws-sdk-go/aws/client
 github.com/aws/aws-sdk-go/aws/client/metadata
 github.com/aws/aws-sdk-go/aws/corehandlers
-github.com/aws/aws-sdk-go/aws/request
-github.com/aws/aws-sdk-go/internal/sdkuri
+github.com/aws/aws-sdk-go/aws/credentials
+github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds
+github.com/aws/aws-sdk-go/aws/credentials/endpointcreds
 github.com/aws/aws-sdk-go/aws/credentials/processcreds
 github.com/aws/aws-sdk-go/aws/credentials/stscreds
 github.com/aws/aws-sdk-go/aws/csm
 github.com/aws/aws-sdk-go/aws/defaults
-github.com/aws/aws-sdk-go/internal/ini
-github.com/aws/aws-sdk-go/internal/shareddefaults
-github.com/aws/aws-sdk-go/aws/awsutil
+github.com/aws/aws-sdk-go/aws/ec2metadata
+github.com/aws/aws-sdk-go/aws/endpoints
+github.com/aws/aws-sdk-go/aws/request
+github.com/aws/aws-sdk-go/aws/session
 github.com/aws/aws-sdk-go/aws/signer/v4
+github.com/aws/aws-sdk-go/internal/ini
 github.com/aws/aws-sdk-go/internal/s3err
+github.com/aws/aws-sdk-go/internal/sdkio
+github.com/aws/aws-sdk-go/internal/sdkrand
+github.com/aws/aws-sdk-go/internal/sdkuri
+github.com/aws/aws-sdk-go/internal/shareddefaults
 github.com/aws/aws-sdk-go/private/protocol
 github.com/aws/aws-sdk-go/private/protocol/eventstream
 github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi
-github.com/aws/aws-sdk-go/private/protocol/rest
-github.com/aws/aws-sdk-go/private/protocol/restxml
+github.com/aws/aws-sdk-go/private/protocol/json/jsonutil
 github.com/aws/aws-sdk-go/private/protocol/jsonrpc
 github.com/aws/aws-sdk-go/private/protocol/query
-github.com/aws/aws-sdk-go/internal/sdkrand
-github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds
-github.com/aws/aws-sdk-go/aws/credentials/endpointcreds
-github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil
-github.com/aws/aws-sdk-go/private/protocol/json/jsonutil
 github.com/aws/aws-sdk-go/private/protocol/query/queryutil
+github.com/aws/aws-sdk-go/private/protocol/rest
+github.com/aws/aws-sdk-go/private/protocol/restxml
+github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil
+github.com/aws/aws-sdk-go/service/s3
+github.com/aws/aws-sdk-go/service/s3/s3iface
+github.com/aws/aws-sdk-go/service/ssm
+github.com/aws/aws-sdk-go/service/ssm/ssmiface
+github.com/aws/aws-sdk-go/service/sts
 # github.com/davecgh/go-spew v1.1.1
 github.com/davecgh/go-spew/spew
 # github.com/inconshreveable/mousetrap v1.0.0