Skip to content

Commit

Permalink
*WIP* build also against go 1.12 (#42)
Browse files Browse the repository at this point in the history
* build also against go 1.12
* switch to go 1.12 container
* fix CLI regression
  • Loading branch information
Joachim Barheine authored Apr 11, 2019
1 parent f5fd9a4 commit fecc8f9
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 33 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ sudo: false

go:
- 1.11
- 1.12

install:
- go get -u github.com/Masterminds/glide
- go get -u github.com/golang/lint/golint
- go get -u golang.org/x/lint/golint
- go get -u github.com/mattn/goveralls
- go get -u github.com/golang/mock/mockgen
- go get -u github.com/golang/mock/gomock
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ clean: FORCE

build/docker.tar: dependencies
ifeq ($(OS), Darwin)
docker run --rm -v "$$PWD":"/go/src/github.com/sapcc/maia" -w "/go/src/github.com/sapcc/maia" -e "GOPATH=/go" golang:1.11-stretch env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -a -ldflags '-s -w -linkmode external -extldflags -static' -o maia_linux_amd64
docker run --rm -v "$$PWD":"/go/src/github.com/sapcc/maia" -w "/go/src/github.com/sapcc/maia" -e "GOPATH=/go" golang:1.12-stretch env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -a -ldflags '-s -w -linkmode external -extldflags -static' -o maia_linux_amd64
else
env CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -a -ldflags '-s -w -linkmode external -extldflags -static' -o maia_linux_amd64
endif
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ If you don't use OpenStack, you can still use Maia CLI as a feature-complete she

# Installation

Maia can be built with Go 1.11 and 1.12. Older versions are not supported. Newer versions are not tested.

Via Makefile

* `make` to compile and run the binaries from the `build/` directory
Expand Down Expand Up @@ -59,4 +61,4 @@ Maia service from scratch and integrate with Prometheus.
# Integrating and Extending Maia

The [Maia developers guide](./docs/developers-guide.md) describes how to use the Maia API. Also
it contains information how to contribute to the Maia development.
it contains information how to contribute to the Maia development.
49 changes: 20 additions & 29 deletions glide.lock

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

2 changes: 1 addition & 1 deletion pkg/keystone/keystone.go
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ func (d *keystone) authenticate(authOpts gophercloud.AuthOptions, asServiceUser
endpointURL: endpointURL,
}

util.LogDebug("add token cache entry for token %s... for scope %+v", authOpts.TokenID[:1+len(authOpts.TokenID)/4], authOpts.Scope)
util.LogDebug("add token cache entry for token %s... for scope %+v", tokenData.Token[:1+len(tokenData.Token)/4], authOpts.Scope)
d.tokenCache.Set(authOpts2StringKey(authOpts), &ce, cache.DefaultExpiration)
return &context, endpointURL, nil
}
Expand Down

0 comments on commit fecc8f9

Please sign in to comment.