Skip to content

Commit 6ad760d

Browse files
authored
Bump to go1.11, replace gov script with https://github.com/golang/dl (#53)
1 parent 0a50772 commit 6ad760d

File tree

5 files changed

+17
-49
lines changed

5 files changed

+17
-49
lines changed

Dockerfile

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
FROM golang:1.10.1
1+
FROM golang:1.11.2
22
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/
83
WORKDIR /go/src/github.com/codeship/codeship-go
4+
COPY . .
5+
RUN make setup

Makefile

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
GOTOOLS = \
2-
github.com/alecthomas/gometalinter \
32
golang.org/x/tools/cmd/cover \
43
github.com/golang/dep/cmd/dep \
4+
github.com/golangci/golangci-lint/cmd/golangci-lint \
55

66
GOPACKAGES := $(go list ./... | grep -v /vendor/)
77
VERSION ?= $(shell git describe --abbrev=0 --tags)
@@ -10,7 +10,6 @@ CHANGELOG_VERSION = $(shell perl -ne '/^\#\# (\d+(\.\d+)+) / && print "$$1\n"' C
1010
.PHONY: setup
1111
setup: ## Install all the build and lint dependencies
1212
go get -u $(GOTOOLS)
13-
gometalinter --install
1413

1514
.PHONY: dep
1615
dep: ## Run dep ensure and prune
@@ -34,7 +33,7 @@ fmt: ## goimports all go files
3433

3534
.PHONY: lint
3635
lint: ## Run all the linters
37-
gometalinter
36+
golangci-lint run
3837

3938
.PHONY: ci
4039
ci: lint ## Run all code checks and tests with coverage reporting

codeship-steps.yml

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
- type: parallel
22
name: "multi-version tests"
33
steps:
4-
- name: "1.8.6 test"
4+
- name: "1.9.7 test"
55
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"
98
service: gov
10-
command: gov 1.9.4 test -v
9+
command: go1.10.5 test -v
1110

1211
- name: "tests"
1312
service: test

docker/gov/Dockerfile

+8-14
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
1-
FROM golang:1.10
1+
FROM golang:1.11.2
22
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
83

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
127

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
1611

17-
RUN mkdir -p /go/src/github.com/codeship/codeship-go
18-
ADD . /go/src/github.com/codeship/codeship-go/
1912
WORKDIR /go/src/github.com/codeship/codeship-go
13+
COPY . .

docker/gov/gov.go

-21
This file was deleted.

0 commit comments

Comments
 (0)