Skip to content

Commit

Permalink
ci: use latest go version
Browse files Browse the repository at this point in the history
Go 1.14.2 was just released, fixing the panics we've
seen in module/apmrestful. Let's use the latest version
to keep with the times.
  • Loading branch information
axw committed Apr 9, 2020
1 parent e34337f commit aed387c
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions .jenkins.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ GO_VERSION:
- "1.10.x"
- "1.11.x"
- "1.12.x"
- "1.13.x"
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ pipeline {
issueCommentTrigger('(?i).*(?:jenkins\\W+)?run\\W+(?:the\\W+)?tests(?:\\W+please)?.*')
}
parameters {
string(name: 'GO_VERSION', defaultValue: "1.12.7", description: "Go version to use.")
string(name: 'GO_VERSION', defaultValue: "1.14.2", description: "Go version to use.")
booleanParam(name: 'Run_As_Master_Branch', defaultValue: false, description: 'Allow to run any steps on a PR, some steps normally only run on master branch.')
booleanParam(name: 'test_ci', defaultValue: true, description: 'Enable test')
booleanParam(name: 'docker_test_ci', defaultValue: true, description: 'Enable run docker tests')
Expand Down
2 changes: 1 addition & 1 deletion internal/tracecontexttest/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.13
FROM golang:latest
ADD . /go/src/go.elastic.co/apm
ENV GO111MODULE=on
ENV GOPROXY=https://proxy.golang.org
Expand Down
2 changes: 1 addition & 1 deletion scripts/Dockerfile-testing
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Code generated by gendockerfile. DO NOT EDIT.
FROM golang:1.13
FROM golang:latest
ENV GO111MODULE=on

COPY go.mod go.sum /go/src/go.elastic.co/apm/
Expand Down
2 changes: 1 addition & 1 deletion scripts/gendockerfile.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var dockerfileTemplateFuncs = template.FuncMap{
// copying across the rest of the source code.
var dockerfileTemplate = template.Must(template.New("Dockerfile").Funcs(dockerfileTemplateFuncs).Parse(`
# Code generated by gendockerfile. DO NOT EDIT.
FROM golang:1.13
FROM golang:latest
ENV GO111MODULE=on
{{range .Dirs}}
COPY {{join . "go.mod"}} {{join . "go.sum"}} {{join "/go/src/go.elastic.co/apm" .}}/{{end}}
Expand Down

0 comments on commit aed387c

Please sign in to comment.