Merge pull request #390 from technote-space/chore/chore-sync-workflows

technote-space · web-flow · commit 60a489a910dc · 2021-10-07T01:41:18.000+09:00
chore: sync workflows
diff --git a/.github/workflow-settings.json b/.github/workflow-settings.json
@@ -25,5 +25,6 @@
     "Using version",
     "ci-helper",
     "tests/bootstrap.php"
-  ]
+  ],
+  "CHANGE_TEMPLATE": "- [ ] ${TITLE} (#${NUMBER}) @${AUTHOR}"
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,5 +1,8 @@
 on: push
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+
 name: CI
 
 jobs:
@@ -10,9 +13,6 @@ jobs:
     env:
       LINT: 1
     steps:
-      - uses: technote-space/auto-cancel-redundant-workflow@v1
-        with:
-          EXCLUDE_MERGED: 'true'
       - name: Set running flag
         run: echo "RUNNING=1" >> $GITHUB_ENV
       - uses: actions/checkout@v2
diff --git a/.github/workflows/pr-updated.yml b/.github/workflows/pr-updated.yml
@@ -32,6 +32,7 @@ jobs:
           TITLE: ${{ env.PR_BODY_TITLE }}
           LINK_ISSUE_KEYWORD: ${{ (startsWith(github.head_ref, 'release/') && 'closes') || '' }}
           FILTER_PR: true
+          CHANGE_TEMPLATE: ${{ env.CHANGE_TEMPLATE }}
 
   manageRelease:
     name: Manage release

Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,6 @@`
`25`	`25`	`"Using version",`
`26`	`26`	`"ci-helper",`
`27`	`27`	`"tests/bootstrap.php"`
`28`		`- ]`
	`28`	`+ ],`
	`29`	`+ "CHANGE_TEMPLATE": "- [ ] ${TITLE} (#${NUMBER}) @${AUTHOR}"`
`29`	`30`	`}`