Skip to content

Commit

Permalink
fix: resolve goreleaser issues and bump golang
Browse files Browse the repository at this point in the history
  • Loading branch information
aeneasr committed Mar 15, 2021
1 parent c246e19 commit 7291df9
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 278 deletions.
36 changes: 12 additions & 24 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,30 @@ version: 2.1

orbs:
sdk: ory/[email protected]
changelog: ory/[email protected].4
goreleaser: ory/[email protected].21
changelog: ory/[email protected].8
goreleaser: ory/[email protected].28
slack: circleci/[email protected]
nancy: ory/[email protected].14
nancy: ory/[email protected].18
docs: ory/[email protected]
golangci: ory/[email protected].13
golangci: ory/[email protected].18

jobs:
test:
docker:
- image: circleci/golang:1.14
- image: circleci/golang:1.16
environment:
- GO111MODULE=on
working_directory: /go/src/github.com/ory/oathkeeper
steps:
- checkout
- setup_remote_docker
- run: go mod download
- go/load-cache
- go/mod-download
- go/save-cache
- goreleaser/install
- goreleaser/check
- golangci/install
- golangci/lint
- run: go install github.com/ory/go-acc github.com/mattn/goveralls
- run: go-acc -o coverage.txt ./... -- -failfast -timeout=20m
- run: test -z "$CIRCLE_PR_NUMBER" && goveralls -service=circle-ci -coverprofile=coverage.txt -repotoken=$COVERALLS_REPO_TOKEN || echo "forks are not allowed to push to coveralls"
Expand All @@ -29,22 +35,13 @@ jobs:
workflows:
"test, build, and relase":
jobs:
- nancy/test:
filters:
tags:
only: /.*/
- golangci/lint:
filters:
tags:
only: /.*/
- test:
filters:
tags:
only: /.*/
- changelog/generate:
requires:
- test
- golangci/lint
filters:
tags:
only: /.*/
Expand All @@ -58,7 +55,6 @@ workflows:
- sdk/release:
requires:
- test
- golangci/lint
- goreleaser/release
filters:
tags:
Expand All @@ -68,23 +64,15 @@ workflows:
- docs/build:
requires:
- test
- golangci/lint
filters:
tags:
only: /.*/
branches:
only: master
-
goreleaser/test:
filters:
tags:
only: /.*/
-
goreleaser/release:
requires:
- goreleaser/test
- test
- golangci/lint
filters:
branches:
ignore: /.*/
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ require (
github.com/ory/analytics-go/v4 v4.0.1
github.com/ory/cli v0.0.10
github.com/ory/fosite v0.36.1
github.com/ory/go-acc v0.2.5
github.com/ory/go-acc v0.2.6
github.com/ory/go-convenience v0.1.0
github.com/ory/gojsonschema v1.2.0
github.com/ory/graceful v0.1.1
Expand Down
Loading

0 comments on commit 7291df9

Please sign in to comment.