Skip to content

Commit

Permalink
Update Go modules
Browse files Browse the repository at this point in the history
* Set minimum Go versoin to 1.13. (error `%w` handling)
* Add `/dist` to git ignore list.
* Update all modules to latest releases.
* Update Go versions in Travis config.

Signed-off-by: Ben Kochie <[email protected]>
  • Loading branch information
SuperQ committed Mar 27, 2021
1 parent ddd88a7 commit a69cff9
Show file tree
Hide file tree
Showing 5 changed files with 469 additions and 41 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/dist
10 changes: 7 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,25 @@ jobs:
- stage: test
os: linux
language: go
env:
GO111MODULE=on
go:
- 1.13.x
- 1.x
script:
- go version
- make test-race vet test
# Compile
- stage: compile
os: linux
language: go
go:
- 1.x
env:
GO111MODULE=on
BUILDINFOSDET=-travis
before_install:
- sudo apt-get update
- sudo apt-get install -y rpm ruby ruby-dev
- sudo gem install fpm
- go version
script:
- GOOS=linux make build-goflow-light
- GOOS=linux make build-goflow
Expand Down
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -90,3 +90,11 @@ package-rpm-goflow: prepare
$(OUTPUT_GOFLOW)=/usr/bin/goflow \
package/goflow.service=/lib/systemd/system/goflow.service \
package/goflow.env=/etc/default/goflow

.PHONY: update-go-deps
update-go-deps:
@echo ">> updating Go dependencies"
@for m in $$(go list -mod=readonly -m -f '{{ if and (not .Indirect) (not .Main)}}{{.Path}}{{end}}' all); do \
go get $$m; \
done
go mod tidy
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
module github.com/cloudflare/goflow/v3

go 1.12
go 1.13

require (
github.com/Shopify/sarama v1.22.0
github.com/golang/protobuf v1.3.1
github.com/libp2p/go-reuseport v0.0.1
github.com/prometheus/client_golang v0.9.2
github.com/sirupsen/logrus v1.4.1
github.com/stretchr/testify v1.3.0
github.com/Shopify/sarama v1.28.0
github.com/golang/protobuf v1.5.1
github.com/libp2p/go-reuseport v0.0.2
github.com/prometheus/client_golang v1.10.0
github.com/sirupsen/logrus v1.8.1
github.com/stretchr/testify v1.7.0
)
Loading

0 comments on commit a69cff9

Please sign in to comment.