Skip to content

Commit

Permalink
Updates for Go 1.17 (#7)
Browse files Browse the repository at this point in the history
* Add Go 1.17 to build matrix

* Update dependencies

* go fmt ./...

* Run all matrix builds even if one fails
  • Loading branch information
ChrisHines authored Sep 10, 2021
1 parent 63376a2 commit ad0641e
Show file tree
Hide file tree
Showing 11 changed files with 47 additions and 44 deletions.
57 changes: 29 additions & 28 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,35 +3,36 @@ name: Test
jobs:
test:
strategy:
fail-fast: false
matrix:
go-version: [1.16.x]
go-version: [1.16.x, 1.17.x]
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
- name: Install Go
uses: actions/setup-go@v1
with:
go-version: ${{ matrix.go-version }}
- name: Install staticcheck
run: go install honnef.co/go/tools/cmd/staticcheck@latest
shell: bash
- name: Install golint
run: go install golang.org/x/lint/golint@latest
shell: bash
- name: Update PATH
run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
shell: bash
- name: Checkout code
uses: actions/checkout@v1
- name: Fmt
if: matrix.platform != 'windows-latest' # :(
run: "diff <(gofmt -d .) <(printf '')"
shell: bash
- name: Vet
run: go vet ./...
- name: Staticcheck
run: staticcheck ./...
- name: Lint
run: golint ./...
- name: Test
run: go test -race ./...
- name: Install Go
uses: actions/setup-go@v1
with:
go-version: ${{ matrix.go-version }}
- name: Install staticcheck
run: go install honnef.co/go/tools/cmd/staticcheck@latest
shell: bash
- name: Install golint
run: go install golang.org/x/lint/golint@latest
shell: bash
- name: Update PATH
run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
shell: bash
- name: Checkout code
uses: actions/checkout@v1
- name: Fmt
if: matrix.platform != 'windows-latest' # :(
run: "diff <(gofmt -d .) <(printf '')"
shell: bash
- name: Vet
run: go vet ./...
- name: Staticcheck
run: staticcheck ./...
- name: Lint
run: golint ./...
- name: Test
run: go test -race ./...
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module github.com/go-kit/log

go 1.16
go 1.17

require (
github.com/go-logfmt/logfmt v0.5.0
github.com/go-stack/stack v1.8.0
github.com/go-logfmt/logfmt v0.5.1
github.com/go-stack/stack v1.8.1
)
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4=
github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
5 changes: 2 additions & 3 deletions syslog/example_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// +build !windows
// +build !plan9
// +build !nacl
//go:build !windows && !plan9 && !nacl
// +build !windows,!plan9,!nacl

package syslog_test

Expand Down
5 changes: 2 additions & 3 deletions syslog/syslog.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// +build !windows
// +build !plan9
// +build !nacl
//go:build !windows && !plan9 && !nacl
// +build !windows,!plan9,!nacl

package syslog

Expand Down
5 changes: 2 additions & 3 deletions syslog/syslog_test.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// +build !windows
// +build !plan9
// +build !nacl
//go:build !windows && !plan9 && !nacl
// +build !windows,!plan9,!nacl

package syslog

Expand Down
1 change: 1 addition & 0 deletions term/colorwriter_others.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//go:build !windows
// +build !windows

package term
Expand Down
1 change: 1 addition & 0 deletions term/terminal_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build !appengine
// +build !appengine

package term
Expand Down
1 change: 1 addition & 0 deletions term/terminal_notwindows.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build (linux && !appengine) || darwin || freebsd || openbsd
// +build linux,!appengine darwin freebsd openbsd

package term
Expand Down
1 change: 1 addition & 0 deletions term/terminal_stub.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build appengine || js
// +build appengine js

package term
Expand Down
1 change: 1 addition & 0 deletions term/terminal_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

//go:build windows
// +build windows

package term
Expand Down

0 comments on commit ad0641e

Please sign in to comment.