Revert 2884 revert 2871 llminatoll test2

.github/workflows/continuous-integration.yaml

@@ -1,26 +1,55 @@
+name: Automerge
+
+on:
+  # Try merging all open pull requests. (Only recommended for testing.)
+  push:
+
+  # Try merging all open pull requests.
+  schedule:
+    - cron: 0 * * * *
+
+  # Try merging pull requests belonging to a workflow run.
+  workflow_run:
+    workflows:
+      - CI
+    types:
+      - completed
+
+  # Try merging pull requests belonging to a check suite.
+  check_suite:
+    types:
+      - completed
+
+  # Try merging a pull request when it is approved.
+  pull_request_review:
+    types:
+      - submitted
+
+  # Try merging a pull request when a draft is marked as “ready for review”, when
+  # a required label is applied or when a “do not merge” label is removed.
+  pull_request_target:
+    types:
+      - labeled
+      - unlabeled
+      - ready_for_review
+
+  # Try merging the specified pull request or all open pull requests if none is specified.
+  workflow_dispatch:
+    inputs:
+      pull-request:
+        description: Pull Request Number
+        required: false
+
 jobs:
-  # Other jobs are defined above. https://github.com/ridedott/merge-me-action
-  merge-me:
-    name: Merge me!
-    needs:
-      - all
-      - other
-      - required
-      - jobs
+  automerge:
+    if: github.event.review.state == 'approved' || !github.event.review
     runs-on: ubuntu-latest
     steps:
-      - name: Merge me!
-        uses: ridedott/merge-me-action@v1
+      - uses: reitermarkus/automerge@v1.4.0
         with:
-          # Depending on branch protection rules, a  manually populated
-          # `GITHUB_TOKEN_WORKAROUND` environment variable with permissions to
-          # push to a protected branch must be used. This variable can have an
-          # arbitrary name, as an example, this repository uses
-          # `GITHUB_TOKEN_DOTTBOTT`.
-          #
-          # When using a custom token, it is recommended to leave the following
-          # comment for other developers to be aware of the reasoning behind it:
-          #
-          # This must be used as GitHub Actions token does not support
-          # pushing to protected branches.
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.MY_GITHUB_TOKEN }}
+          merge-method: rebase
+          do-not-merge-labels: never-merge
+          required-labels: automerge
+          pull-request: ${{ github.event.inputs.pull-request }}
+          dry-run: false

.github/workflows/label.yaml

@@ -0,0 +1,11 @@
+name: Labeler
+on: [pull_request]
+
+jobs:
+  label:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/labeler@main
+        with:
+          repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/labeler.yaml

@@ -0,0 +1,4 @@
+# ルート上のファイルの更新は、すべて「automerge」ラベルをつける
+
+automerge:
+  - ./*

juna.txt

@@ -0,0 +1 @@
+自分用のテキストファイルを作りました

llminatoll.txt

@@ -1,2 +1,3 @@
 湊川あいです！
-好きなものは茎わかめと猫です。
+好きなものは茎わかめと猫です。
+よろしくね！

new.txt

@@ -0,0 +1 @@
+自分用のテキストファイルを作りました。

renovate.json

@@ -0,0 +1,4 @@
+{
+  "extends": ["config:base"],
+  "automerge": true
+}

test.txt

@@ -0,0 +1 @@
+test