Skip to content

Commit

Permalink
Merge pull request #82 from movio/update-go-and-deps
Browse files Browse the repository at this point in the history
Update dependencies and update go to 1.17
  • Loading branch information
Lucian Jones authored Nov 3, 2021
2 parents b054273 + 0cf237e commit e4ec51f
Show file tree
Hide file tree
Showing 8 changed files with 413 additions and 87 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
go-version: 1.17

- name: Build cmd
run: CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags="-X 'github.com/movio/bramble.Version=$(git describe --tags --abbrev=0)'" -o bramble ./cmd/bramble
Expand Down
41 changes: 20 additions & 21 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,31 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v2

- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.16
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17

- name: Build
run: go build -v ./cmd/bramble
- name: Build
run: go build -v ./cmd/bramble

- name: Test
run: go test -v -coverprofile=coverage.txt -covermode=atomic $(go list ./... | grep -v examples)
- name: Test
run: go test -v -coverprofile=coverage.txt -covermode=atomic $(go list ./... | grep -v examples)

- uses: codecov/codecov-action@v1
name: Upload coverage
with:
files: ./coverage.txt
- uses: codecov/codecov-action@v1
name: Upload coverage
with:
files: ./coverage.txt

lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Lint
uses: golangci/golangci-lint-action@v2
with:
version: v1.35
args: --disable errcheck . plugins
only-new-issues: true

- uses: actions/checkout@v2
- name: Lint
uses: golangci/golangci-lint-action@v2
with:
version: v1.35
args: --disable errcheck . plugins
only-new-issues: true
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ the issue you're facing and the proposed solution.

### Building and testing

Prerequisite: Go 1.16 or newer
Prerequisite: Go 1.17 or newer

To build the `bramble` command:

Expand Down
2 changes: 1 addition & 1 deletion docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ the issue you're facing and the proposed solution.

### Building and testing

Prerequisite: Go 1.16 or newer
Prerequisite: Go 1.17 or newer

To build the `bramble` command:

Expand Down
49 changes: 33 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,34 +1,51 @@
module github.com/movio/bramble

go 1.16
go 1.17

require (
github.com/99designs/gqlgen v0.11.2
github.com/felixge/httpsnoop v1.0.1
github.com/fsnotify/fsnotify v1.4.9
github.com/99designs/gqlgen v0.14.0
github.com/felixge/httpsnoop v1.0.2
github.com/fsnotify/fsnotify v1.5.1
github.com/golang-jwt/jwt/v4 v4.0.0
github.com/golang/protobuf v1.4.2 // indirect
github.com/google/go-cmp v0.5.1 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/gorilla/mux v1.7.4
github.com/gorilla/websocket v1.4.2 // indirect
github.com/graph-gophers/graphql-go v0.0.0-20201003130358-c5bdf3b1108e
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
github.com/kr/pretty v0.2.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/mitchellh/mapstructure v1.1.2 // indirect
github.com/prometheus/client_golang v1.2.1
github.com/prometheus/common v0.9.1 // indirect
github.com/prometheus/procfs v0.0.10 // indirect
github.com/mitchellh/mapstructure v1.4.2 // indirect
github.com/prometheus/client_golang v1.11.0
github.com/prometheus/common v0.31.1 // indirect
github.com/prometheus/procfs v0.7.3 // indirect
github.com/rs/cors v1.7.0
github.com/sirupsen/logrus v1.4.2
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.0
github.com/vektah/gqlparser/v2 v2.0.1
github.com/vektah/gqlparser/v2 v2.2.0
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4 // indirect
golang.org/x/sys v0.0.0-20211003122950-b1ebd4e1001c // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/protobuf v1.25.0 // indirect
google.golang.org/protobuf v1.27.1 // indirect
gopkg.in/square/go-jose.v2 v2.5.1
gopkg.in/yaml.v2 v2.3.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
)

require (
github.com/agnivade/levenshtein v1.1.1 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/opentracing/opentracing-go v1.1.0 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/russross/blackfriday/v2 v2.0.1 // indirect
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
github.com/urfave/cli/v2 v2.1.1 // indirect
golang.org/x/mod v0.3.0 // indirect
golang.org/x/tools v0.0.0-20210106214847-113979e3529a // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
)
Loading

0 comments on commit e4ec51f

Please sign in to comment.