Просмотр исходного кода

Merge branch 'master' into support/prepare-v6.1.2-RC.0

Yuki Takei 2 лет назад
Родитель
Сommit
797457677f
2 измененных файлов с 4 добавлено и 4 удалено
  1. 4 3
      .github/workflows/auto-approve.yml
  2. 0 1
      .mergify.yml

+ 4 - 3
.github/workflows/dependabot-auto-approve.yml → .github/workflows/auto-approve.yml

@@ -1,5 +1,4 @@
-# by https://zenn.dev/nemuki/articles/dependabot-auto-merge
-name: Auto approve on dependabot PR at patch update
+name: Auto approve PR
 
 on:
   pull_request_target:
@@ -9,7 +8,9 @@ permissions:
   pull-requests: write
 
 jobs:
-  dependabot-auto-approve:
+  # Auto approve on dependabot PR at patch update
+  #   by https://zenn.dev/nemuki/articles/dependabot-auto-merge
+  approve-updating-patch-version:
     runs-on: ubuntu-latest
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:

+ 0 - 1
.mergify.yml

@@ -15,7 +15,6 @@ pull_request_rules:
   - name: Automatic merge for Preparing next version
     conditions:
       - author = github-actions[bot]
-      - '#approved-reviews-by >= 1'
       - label = "prepare next version"
     actions:
       merge: