Skip to content

Commit

Permalink
Merge pull request #12 from lbryio/roylee17/update-ci-go-version
Browse files Browse the repository at this point in the history
ci: update workflow and Go 1.19
  • Loading branch information
roylee17 authored Aug 5, 2022
2 parents c21be77 + 2428b38 commit eff01c9
Show file tree
Hide file tree
Showing 9 changed files with 32 additions and 127 deletions.
57 changes: 0 additions & 57 deletions .github/workflows/golangci-lint.yml

This file was deleted.

20 changes: 10 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,32 +26,32 @@ env:
GOCACHE: /home/runner/work/go/pkg/build
GOPATH: /home/runner/work/go

GO_VERSION: '^1.18.2'
GO_VERSION: '^1.19'

jobs:
########################
# Format, compileation and lint check
########################
golangci:
name: lint
lint-check:
name: Format, compilation and lint check
runs-on: ubuntu-latest
steps:
- name: git checkout
uses: actions/checkout@v2

- name: setup go ${{ env.GO_VERSION }}
uses: actions/setup-go@v2
with:
go-version: '${{ env.GO_VERSION }}'

- name: checkout source
uses: actions/checkout@v2
- name: run format
run: make fmt

- name: compile code
run: go install -v ./...

- name: golangci-lint
uses: golangci/golangci-lint-action@v2
with:
version: latest
skip-go-installation: true
- name: run lint
run: make lint

########################
# run unit tests
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.18.2
go-version: 1.19

# Login against a Docker registry except on PR
# https://github.com/docker/login-action
Expand Down
2 changes: 1 addition & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ linters:
# - noctx
# - nolintlint
# - prealloc
- rowserrcheck
# - rowserrcheck # Disabled due to generic, see https://github.com/golangci/golangci-lint/issues/2649
# - revive
# - scopelint
# - staticcheck
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ GO_BIN := ${GOPATH}/bin
LINT_BIN := ${GO_BIN}/golangci-lint
GOACC_BIN := $(GO_BIN)/go-acc

LINT_COMMIT := v1.42.1
GOACC_COMMIT := v0.2.6
LINT_COMMIT := v1.48
GOACC_COMMIT := v0.2.8

DEPGET := go install
GOBUILD := go build -v
Expand Down
17 changes: 4 additions & 13 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,46 +14,37 @@ require (
go.etcd.io/bbolt v1.3.6
golang.org/x/crypto v0.0.0-20220518034528-6f7dac969898
golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2
golang.org/x/tools v0.1.10
google.golang.org/grpc v1.46.2
)

require (
github.com/DataDog/zstd v1.5.2 // indirect
github.com/aead/siphash v1.0.1 // indirect
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
github.com/btcsuite/winsvc v1.0.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cockroachdb/errors v1.9.0 // indirect
github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect
github.com/cockroachdb/pebble v0.0.0-20220523221036-bb2c1501ac23 // indirect
github.com/cockroachdb/redact v1.1.3 // indirect
github.com/codahale/hdrhistogram v0.9.0 // indirect
github.com/decred/dcrd/lru v1.1.1 // indirect
github.com/felixge/fgprof v0.9.2 // indirect
github.com/getsentry/sentry-go v0.13.0 // indirect
github.com/go-ole/go-ole v1.2.6 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/pprof v0.0.0-20220520215854-d04f2422c8a1 // indirect
github.com/kkdai/bstream v1.0.0 // indirect
github.com/klauspost/compress v1.15.4 // indirect
github.com/kr/pretty v0.3.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/lufia/plan9stats v0.0.0-20220517141722-cf486979b281 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20220216144756-c35f1ee13d7c // indirect
github.com/rogpeppe/go-internal v1.8.1 // indirect
github.com/shirou/gopsutil/v3 v3.22.4 // indirect
github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect
github.com/tklauser/go-sysconf v0.3.10 // indirect
github.com/tklauser/numcpus v0.5.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
golang.org/x/exp v0.0.0-20220518171630-0b5c67f07fdf // indirect
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
golang.org/x/term v0.0.0-20220411215600-e5f449aeb171 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/genproto v0.0.0-20220524023933-508584e28198 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
Expand All @@ -65,4 +56,4 @@ require (
// version.
replace github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.14.2

go 1.18
go 1.19
Loading

0 comments on commit eff01c9

Please sign in to comment.