Skip to content

Commit

Permalink
Merge branch 'master' into handle_refresh_token_reuse_error
Browse files Browse the repository at this point in the history
  • Loading branch information
kevgo authored Sep 22, 2022
2 parents faae56e + ef3e950 commit 885e90c
Show file tree
Hide file tree
Showing 24 changed files with 377 additions and 277 deletions.
39 changes: 39 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
version: 2.1

orbs:
changelog: ory/changelog@0.1.4
nancy: ory/nancy@0.0.13
golangci: ory/golangci@0.0.19

jobs:
test:
docker:
- image: cimg/go:1.18
steps:
- checkout
- setup_remote_docker
- restore_cache:
keys:
- go-github-ory-fosite-v2-{{ checksum "go.sum" }}
- run: go mod download
- save_cache:
key: go-github-ory-fosite-v2-{{ checksum "go.sum" }}
paths:
- "/go/pkg/mod"
- run: go install github.com/mattn/goveralls github.com/ory/go-acc
- run: go-acc -o coverage.txt ./... -- -v -failfast -timeout=20m

workflows:
tbr:
jobs:
- nancy/test
- test
- golangci/lint
- changelog/generate:
requires:
- test
filters:
tags:
only: /.*/
branches:
only: master
17 changes: 17 additions & 0 deletions .github/workflows/format.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Format

on:
pull_request:
push:

jobs:
format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: 1.19
- run: make format
- name: Indicate formatting issues
run: git diff HEAD --exit-code --color
15 changes: 15 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: Unit tests

on:
pull_request:
push:

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: 1.19
- run: make test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.bin
.idea
*.iml
.cover
Expand Down
7 changes: 7 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.github/ISSUE_TEMPLATE/BUG-REPORT.yml
.github/ISSUE_TEMPLATE/DESIGN-DOC.yml
.github/ISSUE_TEMPLATE/FEATURE-REQUEST.yml
.github/ISSUE_TEMPLATE/config.yml
.github/pull_request_template.md
CHANGELOG.md
CONTRIBUTING.md
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ go:
install:
- go install github.com/mattn/goveralls
- go install github.com/ory/go-acc
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0
- curl -sSfL
https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh |
sh -s -- -b $(go env GOPATH)/bin v1.24.0

script:
- golangci-lint run
Expand Down
Loading

0 comments on commit 885e90c

Please sign in to comment.