From 800049d0d2eae482bf2edd315843b81b5a210e43 Mon Sep 17 00:00:00 2001 From: llminatoll Date: Thu, 17 Dec 2020 22:28:49 +0900 Subject: [PATCH 01/25] =?UTF-8?q?GitHub=20Actions=E3=81=AB=E3=83=97?= =?UTF-8?q?=E3=83=AB=E3=83=AA=E3=82=AF=E3=82=A8=E3=82=B9=E3=83=88=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=97=E3=82=92=E8=BF=BD=E8=A8=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/continuous-integration.yaml | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 9b173d78f..225c722f2 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -1,12 +1,24 @@ +name: Merge me! + +on: + check_suite: + types: + - completed + pull_request: + types: + - edited + - labeled + - opened + - ready_for_review + - reopened + - synchronize + - unlabeled + - unlocked + jobs: # Other jobs are defined above. https://github.com/ridedott/merge-me-action merge-me: name: Merge me! - needs: - - all - - other - - required - - jobs runs-on: ubuntu-latest steps: - name: Merge me! @@ -24,3 +36,4 @@ jobs: # This must be used as GitHub Actions token does not support # pushing to protected branches. GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + MERGE_METHOD: MERGE From 03b4f3e1f2793c2f4d904f3cd5c64b17ab193d0e Mon Sep 17 00:00:00 2001 From: llminatoll Date: Thu, 17 Dec 2020 22:32:47 +0900 Subject: [PATCH 02/25] =?UTF-8?q?=E8=87=AA=E5=8B=95=E3=83=9E=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E5=8B=95=E4=BD=9C=E6=A4=9C=E8=A8=BC=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- llminatoll.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/llminatoll.txt b/llminatoll.txt index c3e130a9d..4dfbf8b33 100644 --- a/llminatoll.txt +++ b/llminatoll.txt @@ -1,2 +1,3 @@ 湊川あいです！ -好きなものは茎わかめと猫です。 \ No newline at end of file +好きなものは茎わかめと猫です。 +よろしくお願いします！ \ No newline at end of file From 1d7effe969dfcfa698141975cc6227d962ce2c92 Mon Sep 17 00:00:00 2001 From: llminatoll Date: Thu, 17 Dec 2020 23:00:19 +0900 Subject: [PATCH 03/25] =?UTF-8?q?=E8=87=AA=E5=8B=95=E5=8C=96=E3=81=AE?= =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=A7=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- llminatoll.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llminatoll.txt b/llminatoll.txt index 4dfbf8b33..49e02ffeb 100644 --- a/llminatoll.txt +++ b/llminatoll.txt @@ -1,3 +1,3 @@ 湊川あいです！ 好きなものは茎わかめと猫です。 -よろしくお願いします！ \ No newline at end of file +よろしくです！ \ No newline at end of file From 1eaef330dc38fbb9194f29afb3c61afffdb68470 Mon Sep 17 00:00:00 2001 From: toru koishi Date: Fri, 18 Dec 2020 14:21:03 +0900 Subject: [PATCH 04/25] =?UTF-8?q?=E8=87=AA=E5=88=86=E3=81=AE=E3=83=86?= =?UTF-8?q?=E3=82=AD=E3=82=B9=E3=83=88=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=92=E4=BD=9C=E6=88=90=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 000000000..30d74d258 --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +test \ No newline at end of file From 349ec911a1adafca06ff914ff1f2872be1af26be Mon Sep 17 00:00:00 2001 From: Masaki Onara Date: Fri, 18 Dec 2020 15:39:13 +0900 Subject: [PATCH 05/25] add juna txt --- juna.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 juna.txt diff --git a/juna.txt b/juna.txt new file mode 100644 index 000000000..5b441eae9 --- /dev/null +++ b/juna.txt @@ -0,0 +1 @@ +自分用のテキストファイルを作りました \ No newline at end of file From 1ca81597003da45be25755f3027cfe5f2a009589 Mon Sep 17 00:00:00 2001 From: yuzunosk55 Date: Fri, 18 Dec 2020 20:04:56 +0900 Subject: [PATCH 06/25] first commit --- new.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 new.txt diff --git a/new.txt b/new.txt new file mode 100644 index 000000000..0193f6395 --- /dev/null +++ b/new.txt @@ -0,0 +1 @@ +自分用のテキストファイルを作りました。 \ No newline at end of file From 6df7cb8fbd71a7630286e107e3d9fbe7880e4d64 Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 20:57:00 +0900 Subject: [PATCH 07/25] =?UTF-8?q?Auto-Merge=20Pull=20Request=20=E7=94=A8?= =?UTF-8?q?=E3=81=AEyaml=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 詳細： https://github.com/marketplace/actions/auto-merge-pull-request --- .github/workflows/continuous-integration.yaml | 68 ++++++++++++------- 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 225c722f2..7e77fd0cf 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -1,39 +1,55 @@ -name: Merge me! +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 - pull_request: + + # 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: - - edited - labeled - - opened - - ready_for_review - - reopened - - synchronize - unlabeled - - unlocked + - 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! + 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 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 }} - MERGE_METHOD: MERGE + 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: true From 30abcbfb78135cefb4c84e631374f8be2bf2c4cd Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 20:59:54 +0900 Subject: [PATCH 08/25] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=A7?= =?UTF-8?q?=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- llminatoll.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llminatoll.txt b/llminatoll.txt index 49e02ffeb..305233855 100644 --- a/llminatoll.txt +++ b/llminatoll.txt @@ -1,3 +1,3 @@ 湊川あいです！ 好きなものは茎わかめと猫です。 -よろしくです！ \ No newline at end of file +よろしくね！ \ No newline at end of file From 561e39a0d9db23897862492d220694eb0178b0ea Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 21:06:54 +0900 Subject: [PATCH 09/25] =?UTF-8?q?dry-run=E3=82=92false=E3=81=AB=E3=81=97?= =?UTF-8?q?=E3=80=81=E8=87=AA=E5=8B=95=E3=83=9E=E3=83=BC=E3=82=B8=E3=82=92?= =?UTF-8?q?=E6=9C=89=E5=8A=B9=E3=81=AB=E3=81=97=E3=81=BE=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/continuous-integration.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 7e77fd0cf..b55ed75f0 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -47,9 +47,9 @@ jobs: steps: - uses: reitermarkus/automerge@v1 with: - token: ${{ secrets.MY_GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} merge-method: rebase do-not-merge-labels: never-merge required-labels: automerge pull-request: ${{ github.event.inputs.pull-request }} - dry-run: true + dry-run: false From e3e3e84494e34da704aafde0400f8e8cdc8109eb Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 21:12:13 +0900 Subject: [PATCH 10/25] =?UTF-8?q?Warning=E3=81=8C=E5=87=BA=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=9F=E3=81=AE=E3=81=A7input=E3=81=AE=E8=A1=A8?= =?UTF-8?q?=E8=A8=98=E3=82=92=E5=90=88=E3=82=8F=E3=81=9B=E3=81=BE=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Warning: Unexpected input(s) 'GITHUB_TOKEN', valid inputs are ['token', 'merge-method', 'squash-title', 'do-not-merge-labels', 'required-labels', 'pull-request', 'pull-request-author-associations', 'review-author-associations', 'dry-run'] --- .github/workflows/continuous-integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index b55ed75f0..0ea6eb0a0 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -47,7 +47,7 @@ jobs: steps: - uses: reitermarkus/automerge@v1 with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} merge-method: rebase do-not-merge-labels: never-merge required-labels: automerge From cef18a3a40e34f10c4cff74179f92b4604b26d9a Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 21:20:00 +0900 Subject: [PATCH 11/25] =?UTF-8?q?=E3=83=88=E3=83=BC=E3=82=AF=E3=83=B3?= =?UTF-8?q?=E9=83=A8=E5=88=86=E3=81=AB=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C?= =?UTF-8?q?=E5=87=BA=E3=82=8B=E3=81=AE=E3=81=A7=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/continuous-integration.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 0ea6eb0a0..f3443d57c 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -46,8 +46,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: reitermarkus/automerge@v1 - with: - token: ${{ secrets.GITHUB_TOKEN }} + with:s + token: ${{ secrets.MY_GITHUB_TOKEN }} merge-method: rebase do-not-merge-labels: never-merge required-labels: automerge From bd61856c810cbc50309d0bdb21ee604aa52dca85 Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 21:24:25 +0900 Subject: [PATCH 12/25] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E6=96=87?= =?UTF-8?q?=E5=AD=97=E3=82=92=E6=B6=88=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/continuous-integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index f3443d57c..199be31d1 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -46,7 +46,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: reitermarkus/automerge@v1 - with:s + with: token: ${{ secrets.MY_GITHUB_TOKEN }} merge-method: rebase do-not-merge-labels: never-merge From fc238bdbd143728d2f530062bd6e21f4d54ee75b Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 21:30:14 +0900 Subject: [PATCH 13/25] =?UTF-8?q?=E3=83=88=E3=83=BC=E3=82=AF=E3=83=B3?= =?UTF-8?q?=E8=A1=A8=E8=A8=98=E3=81=AE=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/continuous-integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 199be31d1..0ea6eb0a0 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -47,7 +47,7 @@ jobs: steps: - uses: reitermarkus/automerge@v1 with: - token: ${{ secrets.MY_GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} merge-method: rebase do-not-merge-labels: never-merge required-labels: automerge From 584ece26c3e07f9ded474268bc4e48ac59337cef Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 21:35:56 +0900 Subject: [PATCH 14/25] =?UTF-8?q?=E3=83=88=E3=83=BC=E3=82=AF=E3=83=B3?= =?UTF-8?q?=E3=81=AE=E8=A1=A8=E8=A8=98=E3=82=92=E5=85=83=E3=81=AB=E6=88=BB?= =?UTF-8?q?=E3=81=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/continuous-integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 0ea6eb0a0..b55ed75f0 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -47,7 +47,7 @@ jobs: steps: - uses: reitermarkus/automerge@v1 with: - token: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} merge-method: rebase do-not-merge-labels: never-merge required-labels: automerge From 8ea07a2bd13afe8f69bb3b287f29a05a88eb0ed8 Mon Sep 17 00:00:00 2001 From: llminatoll <22927920+llminatoll@users.noreply.github.com> Date: Fri, 18 Dec 2020 21:38:03 +0900 Subject: [PATCH 15/25] =?UTF-8?q?Revert=20"=E3=83=88=E3=83=BC=E3=82=AF?= =?UTF-8?q?=E3=83=B3=E3=81=AE=E8=A1=A8=E8=A8=98=E3=82=92=E5=85=83=E3=81=AB?= =?UTF-8?q?=E6=88=BB=E3=81=99"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/continuous-integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index b55ed75f0..0ea6eb0a0 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -47,7 +47,7 @@ jobs: steps: - uses: reitermarkus/automerge@v1 with: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} merge-method: rebase do-not-merge-labels: never-merge required-labels: automerge From 25f3533bb94f8c97923eb9b10dbc66cffc7ae130 Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 21:48:52 +0900 Subject: [PATCH 16/25] =?UTF-8?q?=E3=83=88=E3=83=BC=E3=82=AF=E3=83=B3?= =?UTF-8?q?=E9=83=A8=E5=88=86=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/continuous-integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 0ea6eb0a0..199be31d1 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -47,7 +47,7 @@ jobs: steps: - uses: reitermarkus/automerge@v1 with: - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.MY_GITHUB_TOKEN }} merge-method: rebase do-not-merge-labels: never-merge required-labels: automerge From 51daf01482009b0df3ab3d23901dccb4c88d2375 Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 21:52:39 +0900 Subject: [PATCH 17/25] =?UTF-8?q?uses:=20reitermarkus/automerge@v1.3.0=20?= =?UTF-8?q?=E3=81=AB=20=E3=83=90=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E3=82=92=E4=B8=8A=E3=81=92=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/continuous-integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 199be31d1..7f845c934 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -45,7 +45,7 @@ jobs: if: github.event.review.state == 'approved' || !github.event.review runs-on: ubuntu-latest steps: - - uses: reitermarkus/automerge@v1 + - uses: reitermarkus/automerge@v1.3.0 with: token: ${{ secrets.MY_GITHUB_TOKEN }} merge-method: rebase From 9b9bfed56794b3ff79d1df892a75299837a79a1c Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 18 Dec 2020 12:58:47 +0000 Subject: [PATCH 18/25] Add renovate.json --- renovate.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 renovate.json diff --git a/renovate.json b/renovate.json new file mode 100644 index 000000000..f45d8f110 --- /dev/null +++ b/renovate.json @@ -0,0 +1,5 @@ +{ + "extends": [ + "config:base" + ] +} From 99bbc48cc13e026653efa49ceb1f32b02f0592dd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 18 Dec 2020 13:02:51 +0000 Subject: [PATCH 19/25] chore(deps): update reitermarkus/automerge action to v1.4.0 --- .github/workflows/continuous-integration.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 7f845c934..3775a9ce7 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -45,7 +45,7 @@ jobs: if: github.event.review.state == 'approved' || !github.event.review runs-on: ubuntu-latest steps: - - uses: reitermarkus/automerge@v1.3.0 + - uses: reitermarkus/automerge@v1.4.0 with: token: ${{ secrets.MY_GITHUB_TOKEN }} merge-method: rebase From e8999db1832250b0a4392f03eb9194cd1012db69 Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 22:16:58 +0900 Subject: [PATCH 20/25] =?UTF-8?q?renovate.json=E3=81=AB=20=20"automerge":?= =?UTF-8?q?=20true=20=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renovate.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/renovate.json b/renovate.json index f45d8f110..e788a5a6d 100644 --- a/renovate.json +++ b/renovate.json @@ -1,5 +1,4 @@ { - "extends": [ - "config:base" - ] + "extends": ["config:base"], + "automerge": true } From f9083ff08f3ef67f772afb50a047e81f1b55c84d Mon Sep 17 00:00:00 2001 From: llminatoll <22927920+llminatoll@users.noreply.github.com> Date: Fri, 18 Dec 2020 22:18:34 +0900 Subject: [PATCH 21/25] Revert "Llminatoll test2" --- llminatoll.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/llminatoll.txt b/llminatoll.txt index 305233855..c3e130a9d 100644 --- a/llminatoll.txt +++ b/llminatoll.txt @@ -1,3 +1,2 @@ 湊川あいです！ -好きなものは茎わかめと猫です。 -よろしくね！ \ No newline at end of file +好きなものは茎わかめと猫です。 \ No newline at end of file From b48a1661a7cf0bd35b0bc85555e14256e0d1bdbf Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 22:38:28 +0900 Subject: [PATCH 22/25] =?UTF-8?q?Pull=20Request=20Labeler=E3=82=A2?= =?UTF-8?q?=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E7=94=A8=E3=81=AEyaml?= =?UTF-8?q?=E3=82=922=E3=81=A4=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://dev.classmethod.jp/articles/github-actions-pull-request-labeler/ --- .github/workflows/label.yaml | 11 +++++++++++ .github/workflows/labeler.yaml | 4 ++++ 2 files changed, 15 insertions(+) create mode 100644 .github/workflows/label.yaml create mode 100644 .github/workflows/labeler.yaml diff --git a/.github/workflows/label.yaml b/.github/workflows/label.yaml new file mode 100644 index 000000000..1f0a79f5c --- /dev/null +++ b/.github/workflows/label.yaml @@ -0,0 +1,11 @@ +name: Labeler +on: [pull_request] + +jobs: + label: + runs-on: ubuntu-latest + + steps: + - uses: actions/labeler@v2 + with: + repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/labeler.yaml b/.github/workflows/labeler.yaml new file mode 100644 index 000000000..e0c02d65e --- /dev/null +++ b/.github/workflows/labeler.yaml @@ -0,0 +1,4 @@ +# ルート上のファイルの更新は、すべて「automerge」ラベルをつける + +automerge: +- * \ No newline at end of file From caa3e3b230a1642f3d4962aa5fa7a8977072374d Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 22:42:51 +0900 Subject: [PATCH 23/25] =?UTF-8?q?=E6=AD=A3=E8=A6=8F=E8=A1=A8=E7=8F=BE?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/labeler.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/labeler.yaml b/.github/workflows/labeler.yaml index e0c02d65e..5d4053eb9 100644 --- a/.github/workflows/labeler.yaml +++ b/.github/workflows/labeler.yaml @@ -1,4 +1,4 @@ # ルート上のファイルの更新は、すべて「automerge」ラベルをつける automerge: -- * \ No newline at end of file + - ./* From 2f8feba11fd227237040ff7560afc73a97a6a225 Mon Sep 17 00:00:00 2001 From: llminatoll Date: Fri, 18 Dec 2020 22:46:41 +0900 Subject: [PATCH 24/25] =?UTF-8?q?labeler=E3=81=AE=E3=83=90=E3=83=BC?= =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/label.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/label.yaml b/.github/workflows/label.yaml index 1f0a79f5c..2a5a0eb74 100644 --- a/.github/workflows/label.yaml +++ b/.github/workflows/label.yaml @@ -6,6 +6,6 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/labeler@v2 + - uses: actions/labeler@main with: repo-token: "${{ secrets.GITHUB_TOKEN }}" From 2b4017eea7e19c15ffe152ccee9c11b05b68370d Mon Sep 17 00:00:00 2001 From: llminatoll <22927920+llminatoll@users.noreply.github.com> Date: Fri, 18 Dec 2020 22:47:19 +0900 Subject: [PATCH 25/25] Revert "Revert "Llminatoll test2"" --- llminatoll.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/llminatoll.txt b/llminatoll.txt index c3e130a9d..305233855 100644 --- a/llminatoll.txt +++ b/llminatoll.txt @@ -1,2 +1,3 @@ 湊川あいです！ -好きなものは茎わかめと猫です。 \ No newline at end of file +好きなものは茎わかめと猫です。 +よろしくね！ \ No newline at end of file