File tree 5 files changed +17
-49
lines changed
5 files changed +17
-49
lines changed Original file line number Diff line number Diff line change 1
- FROM golang:1.10.1
1
+ FROM golang:1.11.2
2
2
LABEL maintainer=dev@codeship.com
3
- RUN go get -v github.com/alecthomas/gometalinter && \
4
- go get -v golang.org/x/tools/cmd/cover && \
5
- gometalinter --install
6
- RUN mkdir -p /go/src/github.com/codeship/codeship-go
7
- ADD . /go/src/github.com/codeship/codeship-go/
8
3
WORKDIR /go/src/github.com/codeship/codeship-go
4
+ COPY . .
5
+ RUN make setup
Original file line number Diff line number Diff line change 1
1
GOTOOLS = \
2
- github.com/alecthomas/gometalinter \
3
2
golang.org/x/tools/cmd/cover \
4
3
github.com/golang/dep/cmd/dep \
4
+ github.com/golangci/golangci-lint/cmd/golangci-lint \
5
5
6
6
GOPACKAGES := $(go list ./... | grep -v /vendor/ )
7
7
VERSION ?= $(shell git describe --abbrev=0 --tags)
@@ -10,7 +10,6 @@ CHANGELOG_VERSION = $(shell perl -ne '/^\#\# (\d+(\.\d+)+) / && print "$$1\n"' C
10
10
.PHONY : setup
11
11
setup : # # Install all the build and lint dependencies
12
12
go get -u $(GOTOOLS )
13
- gometalinter --install
14
13
15
14
.PHONY : dep
16
15
dep : # # Run dep ensure and prune
@@ -34,7 +33,7 @@ fmt: ## goimports all go files
34
33
35
34
.PHONY : lint
36
35
lint : # # Run all the linters
37
- gometalinter
36
+ golangci-lint run
38
37
39
38
.PHONY : ci
40
39
ci : lint # # Run all code checks and tests with coverage reporting
Original file line number Diff line number Diff line change 1
1
- type : parallel
2
2
name : " multi-version tests"
3
3
steps :
4
- - name : " 1.8.6 test"
4
+ - name : " 1.9.7 test"
5
5
service : gov
6
- command : gov 1.8.6 test -v
7
-
8
- - name : " 1.9.4 test"
6
+ command : go1.9.7 test -v
7
+ - name : " 1.10.5 test"
9
8
service : gov
10
- command : gov 1.9.4 test -v
9
+ command : go1.10.5 test -v
11
10
12
11
- name : " tests"
13
12
service : test
Original file line number Diff line number Diff line change 1
- FROM golang:1.10
1
+ FROM golang:1.11.2
2
2
LABEL maintainer=dev@codeship.com
3
- RUN mkdir -p /go/src/github.com/codeship/gov
4
- ADD ./docker/gov /go/src/github.com/codeship/gov
5
- WORKDIR /go/src/github.com/codeship/gov
6
- RUN go get golang.org/x/build/version
7
- RUN go install
8
3
9
- # go 1.8.6
10
- RUN go get golang.org/x/build/version/ go1.8.6 && \
11
- go1.8.6 download
4
+ # go 1.9.7
5
+ RUN go get golang.org/dl/ go1.9.7 && \
6
+ go1.9.7 download
12
7
13
- # go 1.9.4
14
- RUN go get golang.org/x/build/version/ go1.9.4 && \
15
- go1.9.4 download
8
+ # go 1.10.5
9
+ RUN go get golang.org/dl/ go1.10.5 && \
10
+ go1.10.5 download
16
11
17
- RUN mkdir -p /go/src/github.com/codeship/codeship-go
18
- ADD . /go/src/github.com/codeship/codeship-go/
19
12
WORKDIR /go/src/github.com/codeship/codeship-go
13
+ COPY . .
Load Diff This file was deleted.
You can’t perform that action at this time.
0 commit comments