Skip to content

Commit

Permalink
Merge branch 'develop' into fix/nestedValidatorErrorPoint
Browse files Browse the repository at this point in the history
  • Loading branch information
ytetsuro authored Mar 23, 2021
2 parents fca46f7 + 48d93b7 commit b95efbc
Show file tree
Hide file tree
Showing 5 changed files with 272 additions and 270 deletions.
1 change: 0 additions & 1 deletion .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ extends:
- 'plugin:@typescript-eslint/recommended-requiring-type-checking'
- 'plugin:jest/recommended'
- 'prettier'
- 'prettier/@typescript-eslint'
rules:
'@typescript-eslint/explicit-member-accessibility': off
'@typescript-eslint/no-angle-bracket-type-assertion': off
Expand Down
2 changes: 2 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ updates:
commit-message:
prefix: build
include: scope
ignore:
- dependency-name: "husky"
20 changes: 16 additions & 4 deletions .github/workflows/auto-approve-dependabot-workflow.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,23 @@
name: Auto approve PRs
name: Dependabot auto-merge
on:
pull_request
jobs:
dependabot:
runs-on: ubuntu-latest
if: github.actor == 'dependabot[bot]'
steps:
- uses: hmarr/auto-approve[email protected]
if: github.actor == 'dependabot[bot]'
- name: 'Auto approve PR by Dependabot'
uses: hmarr/[email protected]
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
github-token: "${{ secrets.TYPESTACK_BOT_TOKEN }}"
- name: 'Comment merge command'
uses: actions/github-script@v3
with:
github-token: ${{secrets.TYPESTACK_BOT_TOKEN }}
script: |
await github.issues.createComment({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
body: '@dependabot squash and merge'
})
Loading

0 comments on commit b95efbc

Please sign in to comment.