Skip to content

Commit

Permalink
Switch to Go 1.8 installation inside CI (#589)
Browse files Browse the repository at this point in the history
* Switch to Go 1.8 installation inside CI

Partially Addresses: #588

* Use url.Hostname() instead of custom method
  • Loading branch information
denismakogon authored and ccirello committed Mar 15, 2017
1 parent 35af509 commit 2a0e9f4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 17 deletions.
16 changes: 1 addition & 15 deletions api/datastore/internal/datastoretest/test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ import (
"net/http"
"os"
"net/url"
"strings"
)

func setLogBuffer() *bytes.Buffer {
Expand All @@ -27,26 +26,13 @@ func setLogBuffer() *bytes.Buffer {
return &buf
}

// workaround for parts.Hostname() that doesn't work on Go1.7.1
// TODO(denismakogon): remove this after switching to Go 1.8
func stripPort(hostport string) string {
colon := strings.IndexByte(hostport, ':')
if colon == -1 {
return hostport
}
if i := strings.IndexByte(hostport, ']'); i != -1 {
return strings.TrimPrefix(hostport[:i], "[")
}
return hostport[:colon]
}

func GetContainerHostIP() string {
dockerHost := os.Getenv("DOCKER_HOST")
if dockerHost == "" {
return "127.0.0.1"
}
parts, _ := url.Parse(dockerHost)
return stripPort(parts.Host)
return parts.Hostname()
}

func Test(t *testing.T, ds models.Datastore) {
Expand Down
4 changes: 2 additions & 2 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ checkout:

dependencies:
pre:
- wget https://storage.googleapis.com/golang/go1.7.1.linux-amd64.tar.gz
- wget https://storage.googleapis.com/golang/go1.8.linux-amd64.tar.gz
- mkdir -p $HOME/golang
- tar -C $HOME/golang -xvzf go1.7.1.linux-amd64.tar.gz
- tar -C $HOME/golang -xvzf go1.8.linux-amd64.tar.gz
- wget https://github.com/Masterminds/glide/releases/download/v0.12.3/glide-v0.12.3-linux-amd64.tar.gz
- tar -C $HOME/bin -xvzf glide-v0.12.3-linux-amd64.tar.gz --strip=1
override:
Expand Down

0 comments on commit 2a0e9f4

Please sign in to comment.