Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10332 from gyuho/update

Browse Source 
*: update Go versions
This commit is contained in:
Gyuho Lee 2018-12-17 15:19:49 -08:00 committed by GitHub
commit 1bbe6bd7d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -6,7 +6,7 @@ sudo: required
services: docker services: docker
go: go:
- 1.11.1 - 1.11.4
- tip - tip
notifications: notifications:
@ -30,13 +30,13 @@ env:
matrix: matrix:
fast_finish: true fast_finish: true
allow_failures: allow_failures:
- go: 1.11.1 - go: 1.11.4
env: TARGET=linux-amd64-grpcproxy env: TARGET=linux-amd64-grpcproxy
- go: 1.11.1 - go: 1.11.4
env: TARGET=linux-amd64-coverage env: TARGET=linux-amd64-coverage
- go: tip - go: tip
env: TARGET=linux-amd64-fmt-unit-go-tip env: TARGET=linux-amd64-fmt-unit-go-tip
- go: 1.11.1 - go: 1.11.4
env: TARGET=linux-386-unit env: TARGET=linux-386-unit
exclude: exclude:
- go: tip - go: tip
@ -57,7 +57,7 @@ matrix:
env: TARGET=linux-amd64-grpcproxy env: TARGET=linux-amd64-grpcproxy
- go: tip - go: tip
env: TARGET=linux-amd64-coverage env: TARGET=linux-amd64-coverage
- go: 1.11.1 - go: 1.11.4
env: TARGET=linux-amd64-fmt-unit-go-tip env: TARGET=linux-amd64-fmt-unit-go-tip
- go: tip - go: tip
env: TARGET=linux-386-unit env: TARGET=linux-386-unit

6
Makefile
View File

@ -51,7 +51,7 @@ docker-remove:
GO_VERSION ?= 1.11.1 GO_VERSION ?= 1.11.4
ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound") ETCD_VERSION ?= $(shell git rev-parse --short HEAD || echo "GitNotFound")
TEST_SUFFIX = $(shell date +%s | base64 | head -c 15) TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
@ -65,11 +65,11 @@ endif
# Example: # Example:
# GO_VERSION=1.10.3 make build-docker-test # GO_VERSION=1.10.7 make build-docker-test
# make build-docker-test # make build-docker-test
# #
# gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd-development.json)" https://gcr.io # gcloud docker -- login -u _json_key -p "$(cat /etc/gcp-key-etcd-development.json)" https://gcr.io
# GO_VERSION=1.10.3 make push-docker-test # GO_VERSION=1.10.7 make push-docker-test
# make push-docker-test # make push-docker-test
# #
# gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com # gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com

2
auth/store_test.go
View File

@ -120,7 +120,7 @@ func setupAuthStore(t *testing.T) (store *authStore, teardownfunc func(t *testin
t.Fatal(err) t.Fatal(err)
} }
tearDown := func(t *testing.T) { tearDown := func(_ *testing.T) {
b.Close() b.Close()
os.Remove(tPath) os.Remove(tPath)
as.Close() as.Close()

2
embed/serve.go
View File

@ -276,7 +276,7 @@ func (sctx *serveCtx) createMux(gwmux *gw.ServeMux, handler http.Handler) *http.
gwmux, gwmux,
wsproxy.WithRequestMutator( wsproxy.WithRequestMutator(
// Default to the POST method for streams // Default to the POST method for streams
func(incoming *http.Request, outgoing *http.Request) *http.Request { func(_ *http.Request, outgoing *http.Request) *http.Request {
outgoing.Method = "POST" outgoing.Method = "POST"
return outgoing return outgoing
}, },

2
test
View File

@ -616,6 +616,7 @@ function commit_title_pass {
function fmt_pass { function fmt_pass {
toggle_failpoints disable toggle_failpoints disable
# TODO: add "unparam"
for p in shellcheck \ for p in shellcheck \
markdown_you \ markdown_you \
markdown_marker \ markdown_marker \
@ -625,7 +626,6 @@ function fmt_pass {
govet_shadow \ govet_shadow \
gosimple \ gosimple \
unused \ unused \
unparam \
staticcheck \ staticcheck \
revive \ revive \
unconvert \ unconvert \