Browse Source

Merge pull request #1176 from Shopify/go111

Support Go 1.11
Vlad Gorodetsky 7 years ago
parent
commit
23ac6450d2
4 changed files with 12 additions and 12 deletions
  1. 4 4
      .travis.yml
  2. 1 1
      README.md
  3. 6 6
      client_tls_test.go
  4. 1 1
      dev.yml

+ 4 - 4
.travis.yml

@@ -1,8 +1,8 @@
 language: go
 language: go
 go:
 go:
-- 1.8.x
-- 1.9.x
-- 1.10.x
+- 1.9.7
+- 1.10.4
+- 1.11
 
 
 env:
 env:
   global:
   global:
@@ -28,7 +28,7 @@ script:
 - make test
 - make test
 - make vet
 - make vet
 - make errcheck
 - make errcheck
-- make fmt
+- if [ "$TRAVIS_GO_VERSION" = "1.11" ]; then make fmt; fi
 
 
 after_success:
 after_success:
 - bash <(curl -s https://codecov.io/bash)
 - bash <(curl -s https://codecov.io/bash)

+ 1 - 1
README.md

@@ -21,7 +21,7 @@ You might also want to look at the [Frequently Asked Questions](https://github.c
 Sarama provides a "2 releases + 2 months" compatibility guarantee: we support
 Sarama provides a "2 releases + 2 months" compatibility guarantee: we support
 the two latest stable releases of Kafka and Go, and we provide a two month
 the two latest stable releases of Kafka and Go, and we provide a two month
 grace period for older releases. This means we currently officially support
 grace period for older releases. This means we currently officially support
-Go 1.8 through 1.10, and Kafka 0.11 through 1.1, although older releases are
+Go 1.8 through 1.11, and Kafka 1.0 through 2.0, although older releases are
 still likely to work.
 still likely to work.
 
 
 Sarama follows semantic versioning and provides API stability via the gopkg.in service.
 Sarama follows semantic versioning and provides API stability via the gopkg.in service.

+ 6 - 6
client_tls_test.go

@@ -33,12 +33,12 @@ func TestTLS(t *testing.T) {
 	nva := time.Now().Add(1 * time.Hour)
 	nva := time.Now().Add(1 * time.Hour)
 
 
 	caTemplate := &x509.Certificate{
 	caTemplate := &x509.Certificate{
-		Subject:      pkix.Name{CommonName: "ca"},
-		Issuer:       pkix.Name{CommonName: "ca"},
-		SerialNumber: big.NewInt(0),
-		NotAfter:     nva,
-		NotBefore:    nvb,
-		IsCA:         true,
+		Subject:               pkix.Name{CommonName: "ca"},
+		Issuer:                pkix.Name{CommonName: "ca"},
+		SerialNumber:          big.NewInt(0),
+		NotAfter:              nva,
+		NotBefore:             nvb,
+		IsCA:                  true,
 		BasicConstraintsValid: true,
 		BasicConstraintsValid: true,
 		KeyUsage:              x509.KeyUsageCertSign,
 		KeyUsage:              x509.KeyUsageCertSign,
 	}
 	}

+ 1 - 1
dev.yml

@@ -2,7 +2,7 @@ name: sarama
 
 
 up:
 up:
   - go:
   - go:
-      version: '1.10'
+      version: '1.11'
 
 
 commands:
 commands:
   test:
   test: