Browse Source

Merge pull request #10332 from gyuho/update

*: update Go versions
Gyuho Lee 7 years ago
parent
commit
1bbe6bd7d3
5 changed files with 11 additions and 11 deletions
  1. 5 5
      .travis.yml
  2. 3 3
      Makefile
  3. 1 1
      auth/store_test.go
  4. 1 1
      embed/serve.go
  5. 1 1
      test

+ 5 - 5
.travis.yml

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

+ 3 - 3
Makefile

@@ -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")
 
 TEST_SUFFIX = $(shell date +%s | base64 | head -c 15)
@@ -65,11 +65,11 @@ endif
 
 
 # Example:
-#   GO_VERSION=1.10.3 make build-docker-test
+#   GO_VERSION=1.10.7 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
-#   GO_VERSION=1.10.3 make push-docker-test
+#   GO_VERSION=1.10.7 make push-docker-test
 #   make push-docker-test
 #
 #   gsutil -m acl ch -u allUsers:R -r gs://artifacts.etcd-development.appspot.com

+ 1 - 1
auth/store_test.go

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

+ 1 - 1
embed/serve.go

@@ -276,7 +276,7 @@ func (sctx *serveCtx) createMux(gwmux *gw.ServeMux, handler http.Handler) *http.
 			gwmux,
 			wsproxy.WithRequestMutator(
 				// 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"
 					return outgoing
 				},

+ 1 - 1
test

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