Skip to content

Commit

Permalink
feat: Angular improvements & testapp TG-418
Browse files Browse the repository at this point in the history
  • Loading branch information
JanCizmar committed Nov 24, 2021
1 parent 8e2feac commit e5b58f2
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 14 deletions.
6 changes: 6 additions & 0 deletions .github/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
minApprovals:
MEMBER: 1
requiredLabels:
- dependencies
updateBranch: true
mergeMethod: rebase
24 changes: 10 additions & 14 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
name: Automerge Deps!
name: auto-merge

on:
workflow_run:
types:
- completed
workflows:
- 'Test'
on: [ pull_request_target ]

jobs:
merge-me:
name: Merge it!
auto-merge:
runs-on: ubuntu-latest
if: github.actor == 'dependabot[bot]'
steps:
- if: ${{ github.event.workflow_run.conclusion == 'success' }}
name: Merge it!
uses: ridedott/merge-me-action@v2
- uses: actions/checkout@v2
- uses: ahmadnassri/action-dependabot-auto-merge@v2
with:
PRESET: DEPENDABOT_MINOR
GITHUB_TOKEN: '${{ secrets.TOLGEE_MACHINE_PAT }}'
botName: tolgee
approve: true
target: minor
github-token: '${{ secrets.TOLGEE_MACHINE_PAT }}'

0 comments on commit e5b58f2

Please sign in to comment.