Merge pull request #25 from MOderkerk/development

Automated PR
MOderkerk · Feb 8, 2022 · 55aa82b · 55aa82b
2 parents b7fe55e + a50bb3c
commit 55aa82b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.github/workflows/maven-dev.yml b/.github/workflows/maven-dev.yml
@@ -94,7 +94,7 @@ jobs:
           pr_title: Automated PR
           pr_source: development
           pr_target: master
-          pr_labels: auto-merge, automated-pr
+          pr_labels: automerge
           pr_body: |
             ### Changes
              ${{steps.Changelog.outputs.changelog}}

diff --git a/.github/workflows/pullrequest-check.yml b/.github/workflows/pullrequest-check.yml
@@ -71,8 +71,10 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.MY_GITHUBKEY }}
           test: false
           reviewers: FALSE
-          labels: auto-merge, automated-pr
+          labels: automerge
           blocking_labels: do not merge
           checks_enabled: true
-          method: MERGE
+          method: merge
           delete_source_branch: false
+
+