Skip to content

Commit 3427c32

Browse files
authored
Merge pull request #883 from lib/update
bump supported versions; fix tests
2 parents a921722 + 11a62a5 commit 3427c32

File tree

4 files changed

+6
-24
lines changed

4 files changed

+6
-24
lines changed

.travis.sh

-13
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,4 @@ postgresql_uninstall() {
7070
sudo rm -rf /var/lib/postgresql
7171
}
7272

73-
megacheck_install() {
74-
# Lock megacheck version at $MEGACHECK_VERSION to prevent spontaneous
75-
# new error messages in old code.
76-
go get -d honnef.co/go/tools/...
77-
git -C $GOPATH/src/honnef.co/go/tools/ checkout $MEGACHECK_VERSION
78-
go install honnef.co/go/tools/cmd/megacheck
79-
megacheck --version
80-
}
81-
82-
golint_install() {
83-
go get golang.org/x/lint/golint
84-
}
85-
8673
$1

.travis.yml

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
language: go
22

33
go:
4-
- 1.9.x
5-
- 1.10.x
64
- 1.11.x
5+
- 1.12.x
76
- master
87

98
sudo: true
@@ -14,26 +13,21 @@ env:
1413
- PQGOSSLTESTS=1
1514
- PQSSLCERTTEST_PATH=$PWD/certs
1615
- PGHOST=127.0.0.1
17-
- MEGACHECK_VERSION=2017.2.2
1816
matrix:
1917
- PGVERSION=10
2018
- PGVERSION=9.6
2119
- PGVERSION=9.5
2220
- PGVERSION=9.4
23-
- PGVERSION=9.3
24-
- PGVERSION=9.2
25-
- PGVERSION=9.1
26-
- PGVERSION=9.0
2721

2822
before_install:
2923
- ./.travis.sh postgresql_uninstall
3024
- ./.travis.sh pgdg_repository
3125
- ./.travis.sh postgresql_install
3226
- ./.travis.sh postgresql_configure
3327
- ./.travis.sh client_configure
34-
- ./.travis.sh megacheck_install
35-
- ./.travis.sh golint_install
3628
- go get golang.org/x/tools/cmd/goimports
29+
- go get golang.org/x/lint/golint
30+
- GO111MODULE=on go get honnef.co/go/tools/cmd/[email protected]
3731

3832
before_script:
3933
- createdb pqgotest
@@ -44,7 +38,7 @@ script:
4438
- >
4539
goimports -d -e $(find -name '*.go') | awk '{ print } END { exit NR == 0 ? 0 : 1 }'
4640
- go vet ./...
47-
- megacheck -go 1.9 ./...
41+
- staticcheck -go 1.11 ./...
4842
- golint ./...
4943
- PQTEST_BINARY_PARAMETERS=no go test -race -v ./...
5044
- PQTEST_BINARY_PARAMETERS=yes go test -race -v ./...

conn.go

+1
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ type Dialer interface {
9292
DialTimeout(network, address string, timeout time.Duration) (net.Conn, error)
9393
}
9494

95+
// DialerContext is the context-aware dialer interface.
9596
type DialerContext interface {
9697
DialContext(ctx context.Context, network, address string) (net.Conn, error)
9798
}

scram/scram.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
2323
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2424

25-
// Pacakage scram implements a SCRAM-{SHA-1,etc} client per RFC5802.
25+
// Package scram implements a SCRAM-{SHA-1,etc} client per RFC5802.
2626
//
2727
// http://tools.ietf.org/html/rfc5802
2828
//

0 commit comments

Comments
 (0)