Skip to content

Commit

Permalink
Merge pull request #1143 from remind101/rb-go-1-10-8
Browse files Browse the repository at this point in the history
upgrade to go 1.10.8
  • Loading branch information
russellballestrini authored Mar 30, 2019
2 parents fd6b7d4 + 7751784 commit 3daba38
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
<<: *defaults

docker:
- image: circleci/golang:1.7.6
- image: circleci/golang:1.10.8
environment:
ARTIFACTS: /tmp/artifacts

Expand All @@ -40,7 +40,7 @@ jobs:
<<: *defaults

docker:
- image: circleci/golang:1.7.6
- image: circleci/golang:1.10.8
environment:
SHELL: /bin/bash
- image: circleci/postgres:9.3
Expand All @@ -62,7 +62,7 @@ jobs:
<<: *defaults

docker:
- image: circleci/golang:1.7.6
- image: circleci/golang:1.10.8

steps:
- checkout
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.7.6
FROM golang:1.10.8
MAINTAINER Eric Holmes <[email protected]>

LABEL version 0.13.0
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.7.6
FROM golang:1.10.8
MAINTAINER Eric Holmes <[email protected]>

RUN apt-get update -yy && \
Expand Down
2 changes: 1 addition & 1 deletion scheduler/cloudformation/cloudformation.go
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ func (s *Scheduler) waitForDeploymentsToStabilize(ctx context.Context, deploymen
for _, service := range services {
d, ok := deployments[*service.ServiceArn]
if !ok {
return false, fmt.Errorf("missing deployment for: %s", service.ServiceArn)
return false, fmt.Errorf("missing deployment for: %s", *service.ServiceArn)
}
primary := false
stable := len(service.Deployments) == 1
Expand Down
4 changes: 4 additions & 0 deletions server/auth/github/client_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// it seems like the mock library cannot detect our functions for
// any go version over 1.7.6 -- this comment will disable these tests.
// +build !go1.10

package github

import (
Expand Down

0 comments on commit 3daba38

Please sign in to comment.