Skip to content

Commit

Permalink
Merge 8db725a into 9ecc972
Browse files Browse the repository at this point in the history
  • Loading branch information
eranharel committed Oct 10, 2019
2 parents 9ecc972 + 8db725a commit 84f4541
Show file tree
Hide file tree
Showing 6 changed files with 284 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Expand Up @@ -3,7 +3,7 @@ version: 2.1
jobs:
build:
docker:
- image: circleci/golang:1.12 # the primary container, where your job's commands are run
- image: circleci/golang:1.13 # the primary container, where your job's commands are run
# environment:
# GOPROXY: https://proxy.golang.org
steps:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/go.yaml
Expand Up @@ -5,10 +5,10 @@ jobs:
name: build, test, lint
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.12
- name: Set up Go 1.13
uses: actions/setup-go@v1
with:
go-version: 1.12
go-version: 1.13

- name: Check out source code
uses: actions/checkout@v1
Expand All @@ -24,7 +24,7 @@ jobs:
run: go test -v ./...

- name: Install golangci-lint
run: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.19.0
run: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.20.0

- name: Run golangci-lint
run: $(go env GOPATH)/bin/golangci-lint run -E golint -E gosec -E gofmt
3 changes: 2 additions & 1 deletion .travis.yml
Expand Up @@ -3,6 +3,7 @@ language: go
go:
- 1.11.x
- 1.12.x
- 1.13.x

before_install:
- go get github.com/mattn/goveralls
Expand All @@ -14,4 +15,4 @@ script:
- make
# - make testflags="-race"
# submit to goveralls only on the latest version to avoid timeouts
- if [[ $TRAVIS_GO_VERSION == 1.12* ]]; then $GOPATH/bin/goveralls -service=travis-ci; fi
- if [[ $TRAVIS_GO_VERSION == 1.13* ]]; then $GOPATH/bin/goveralls -service=travis-ci; fi
2 changes: 1 addition & 1 deletion Makefile
Expand Up @@ -8,7 +8,7 @@ build:
go build -v

$(GOLANGCI_LINT):
GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.16.0
GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.20.0

lint: $(GOLANGCI_LINT)
##### linting #####
Expand Down
6 changes: 3 additions & 3 deletions go.mod
@@ -1,12 +1,12 @@
module github.com/AppsFlyer/go-sundheit

go 1.12
go 1.13

require (
github.com/InVisionApp/go-logger v1.0.1
github.com/fortytw2/leaktest v1.3.0
github.com/onsi/gomega v1.4.2 // indirect
github.com/golangci/golangci-lint v1.20.0 // indirect
github.com/pkg/errors v0.8.1
github.com/stretchr/testify v1.3.0
github.com/stretchr/testify v1.4.0
go.opencensus.io v0.22.1
)

0 comments on commit 84f4541

Please sign in to comment.