Skip to content

Bump to golang 1.12.9 #2880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dperny merged 4 commits into from
Aug 20, 2019
Merged

Bump to golang 1.12.9 #2880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
daf8720
Bump Golang 1.11.13
thaJeztah Aug 19, 2019
be528e8
Bump Golang 1.12.9
thaJeztah Aug 19, 2019
43fac9c
Update tests for new output with Go 1.12
thaJeztah Aug 19, 2019
42085d2
YOLO see if this works
thaJeztah Aug 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
# Needed to install go
OS: linux
ARCH: amd64
GOVERSION: 1.11
GOVERSION: 1.12
# Needed to install protoc
PROTOC_VERSION: 3.6.1

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# NOTE(dperny): for some reason, alpine was giving me trouble
FROM golang:1.11.0-stretch
FROM golang:1.12.9-stretch

RUN apt-get update && apt-get install -y make git unzip

Expand Down
12 changes: 5 additions & 7 deletions agent/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,13 +257,11 @@ func reconcileTaskState(ctx context.Context, w *worker, assignments []*api.Assig
}

closeManager := func(tm *taskManager) {
go func(tm *taskManager) {
defer w.closers.Done()
// when a task is no longer assigned, we shutdown the task manager
if err := tm.Close(); err != nil {
log.G(ctx).WithError(err).Error("error closing task manager")
}
}(tm)
defer w.closers.Done()
// when a task is no longer assigned, we shutdown the task manager
if err := tm.Close(); err != nil {
log.G(ctx).WithError(err).Error("error closing task manager")
}

// make an attempt at removing. this is best effort. any errors will be
// retried by the reaper later.
Expand Down
8 changes: 4 additions & 4 deletions template/getter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ func TestTemplatedSecret(t *testing.T) {
Data: []byte("SECRET_VAL={{secret \"unknowntarget\"}}\n"),
Templating: &api.Driver{Name: "golang"},
},
expectedErr: `failed to expand templated secret templatedsecret: template: expansion:1:13: executing "expansion" at <secret "unknowntarge...>: error calling secret: secret target unknowntarget not found`,
expectedErr: `failed to expand templated secret templatedsecret: template: expansion:1:13: executing "expansion" at <secret "unknowntarget">: error calling secret: secret target unknowntarget not found`,
task: modifyTask(func(t *api.Task) {
t.Spec = api.TaskSpec{
Runtime: &api.TaskSpec_Container{
Expand All @@ -185,7 +185,7 @@ func TestTemplatedSecret(t *testing.T) {
Data: []byte("CONFIG_VAL={{config \"unknowntarget\"}}\n"),
Templating: &api.Driver{Name: "golang"},
},
expectedErr: `failed to expand templated secret templatedsecret: template: expansion:1:13: executing "expansion" at <config "unknowntarge...>: error calling config: config target unknowntarget not found`,
expectedErr: `failed to expand templated secret templatedsecret: template: expansion:1:13: executing "expansion" at <config "unknowntarget">: error calling config: config target unknowntarget not found`,
task: modifyTask(func(t *api.Task) {
t.Spec = api.TaskSpec{
Runtime: &api.TaskSpec_Container{
Expand Down Expand Up @@ -440,7 +440,7 @@ func TestTemplatedConfig(t *testing.T) {
Data: []byte("SECRET_VAL={{secret \"unknowntarget\"}}\n"),
Templating: &api.Driver{Name: "golang"},
},
expectedErr: `failed to expand templated config templatedconfig: template: expansion:1:13: executing "expansion" at <secret "unknowntarge...>: error calling secret: secret target unknowntarget not found`,
expectedErr: `failed to expand templated config templatedconfig: template: expansion:1:13: executing "expansion" at <secret "unknowntarget">: error calling secret: secret target unknowntarget not found`,
task: modifyTask(func(t *api.Task) {
t.Spec = api.TaskSpec{
Runtime: &api.TaskSpec_Container{
Expand All @@ -465,7 +465,7 @@ func TestTemplatedConfig(t *testing.T) {
Data: []byte("CONFIG_VAL={{config \"unknowntarget\"}}\n"),
Templating: &api.Driver{Name: "golang"},
},
expectedErr: `failed to expand templated config templatedconfig: template: expansion:1:13: executing "expansion" at <config "unknowntarge...>: error calling config: config target unknowntarget not found`,
expectedErr: `failed to expand templated config templatedconfig: template: expansion:1:13: executing "expansion" at <config "unknowntarget">: error calling config: config target unknowntarget not found`,
task: modifyTask(func(t *api.Task) {
t.Spec = api.TaskSpec{
Runtime: &api.TaskSpec_Container{
Expand Down