Skip to content
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.

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

Switch to go 1.11 #2752

Merged
merged 1 commit into from
Sep 23, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.10.3
GOVERSION: 1.11
# Needed to install protoc
PROTOC: https://github.com/google/protobuf/releases/download/v3.5.0/protoc-3.5.0-linux-x86_64.zip

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
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.10.3-stretch
FROM golang:1.11.0-stretch

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

Expand Down
18 changes: 9 additions & 9 deletions api/api.pb.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2491,8 +2491,8 @@ file {
label: LABEL_OPTIONAL
type: TYPE_UINT32
options {
65003: "os.FileMode"
65001: 0
65003: "os.FileMode"
}
json_name: "mode"
}
Expand Down Expand Up @@ -2646,8 +2646,8 @@ file {
type: TYPE_MESSAGE
type_name: ".google.protobuf.Duration"
options {
65011: 1
65001: 0
65011: 1
}
json_name: "delay"
}
Expand Down Expand Up @@ -3090,8 +3090,8 @@ file {
}
}
options {
62023: "PublishMode"
62001: 0
62023: "PublishMode"
}
}
}
Expand Down Expand Up @@ -3790,8 +3790,8 @@ file {
label: LABEL_OPTIONAL
type: TYPE_UINT32
options {
65003: "os.FileMode"
65001: 0
65003: "os.FileMode"
}
json_name: "mode"
}
Expand Down Expand Up @@ -4207,8 +4207,8 @@ file {
}
}
options {
62023: "NodeRole"
62001: 0
62023: "NodeRole"
}
}
syntax: "proto3"
Expand Down Expand Up @@ -8058,8 +8058,8 @@ file {
type: TYPE_MESSAGE
type_name: ".google.protobuf.Duration"
options {
65011: 1
65001: 0
65011: 1
}
json_name: "period"
}
Expand Down Expand Up @@ -9106,11 +9106,11 @@ file {
}
}
options {
63017: 1
63020: 1
63018: 1
63001: 0
63002: 0
63017: 1
63018: 1
63020: 1
}
}
file {
Expand Down
6 changes: 3 additions & 3 deletions api/dispatcher.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions api/logbroker.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/raft.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion api/types.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion manager/scheduler/constraint_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func setupEnv() {
Addr: "186.17.9.41",
},
},
Tasks: make(map[string]*api.Task),
Tasks: make(map[string]*api.Task),
ActiveTasksCountByService: make(map[string]int),
}
}
Expand Down
4 changes: 2 additions & 2 deletions manager/scheduler/nodeinfo.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ type NodeInfo struct {

func newNodeInfo(n *api.Node, tasks map[string]*api.Task, availableResources api.Resources) NodeInfo {
nodeInfo := NodeInfo{
Node: n,
Tasks: make(map[string]*api.Task),
Node: n,
Tasks: make(map[string]*api.Task),
ActiveTasksCountByService: make(map[string]int),
AvailableResources: availableResources.Copy(),
usedHostPorts: make(map[hostPortSpec]struct{}),
Expand Down
6 changes: 3 additions & 3 deletions protobuf/plugin/raftproxy/test/service.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.