Skip to content

Commit

Permalink
Merge pull request #1176 from Shopify/go111
Browse files Browse the repository at this point in the history
Support Go 1.11
  • Loading branch information
bai committed Sep 26, 2018
2 parents 24893b5 + 970116b commit 23ac645
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
language: go
go:
- 1.8.x
- 1.9.x
- 1.10.x
- 1.9.7
- 1.10.4
- 1.11

env:
global:
Expand All @@ -28,7 +28,7 @@ script:
- make test
- make vet
- make errcheck
- make fmt
- if [ "$TRAVIS_GO_VERSION" = "1.11" ]; then make fmt; fi

after_success:
- bash <(curl -s https://codecov.io/bash)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
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.

Sarama follows semantic versioning and provides API stability via the gopkg.in service.
Expand Down
12 changes: 6 additions & 6 deletions client_tls_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ func TestTLS(t *testing.T) {
nva := time.Now().Add(1 * time.Hour)

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,
KeyUsage: x509.KeyUsageCertSign,
}
Expand Down
2 changes: 1 addition & 1 deletion dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: sarama

up:
- go:
version: '1.10'
version: '1.11'

commands:
test:
Expand Down

0 comments on commit 23ac645

Please sign in to comment.