Skip to content

Commit 74914e7

Browse files
Merge remote-tracking branch 'origin/master' into release/next-v1.5.0
2 parents 4c8752f + b7c538a commit 74914e7

File tree

3 files changed

+10
-12
lines changed

3 files changed

+10
-12
lines changed

.github/workflows/broken-link-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ubuntu-latest
1313
timeout-minutes: 10
1414
steps:
15-
- uses: technote-space/auto-cancel-redundant-job@v1
15+
- uses: technote-space/auto-cancel-redundant-workflow@v1
1616
with:
1717
EXCLUDE_MERGED: 'true'
1818
- name: Broken Link Check

.github/workflows/ci.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
env:
1111
LINT: 1
1212
steps:
13-
- uses: technote-space/auto-cancel-redundant-job@v1
13+
- uses: technote-space/auto-cancel-redundant-workflow@v1
1414
with:
1515
EXCLUDE_MERGED: 'true'
1616
- name: Set running flag
@@ -33,7 +33,7 @@ jobs:
3333
run: echo "::set-output name=dir::$(yarn cache dir)"
3434
if: env.RUNNING
3535
- name: Cache node dependencies
36-
uses: actions/cache@v1
36+
uses: actions/cache@v2
3737
with:
3838
path: ${{ steps.yarn-cache.outputs.dir }}
3939
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -95,7 +95,7 @@ jobs:
9595
run: echo "::set-output name=dir::$(yarn cache dir)"
9696
if: env.RUNNING
9797
- name: Cache node dependencies
98-
uses: actions/cache@v1
98+
uses: actions/cache@v2
9999
with:
100100
path: ${{ steps.yarn-cache.outputs.dir }}
101101
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -170,7 +170,7 @@ jobs:
170170
run: echo "::set-output name=dir::$(yarn cache dir)"
171171
if: env.RUNNING
172172
- name: Cache node dependencies
173-
uses: actions/cache@v1
173+
uses: actions/cache@v2
174174
with:
175175
path: ${{ steps.yarn-cache.outputs.dir }}
176176
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -216,7 +216,7 @@ jobs:
216216
id: yarn-cache
217217
run: echo "::set-output name=dir::$(yarn cache dir)"
218218
- name: Cache node dependencies
219-
uses: actions/cache@v1
219+
uses: actions/cache@v2
220220
with:
221221
path: ${{ steps.yarn-cache.outputs.dir }}
222222
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -252,7 +252,7 @@ jobs:
252252
id: yarn-cache
253253
run: echo "::set-output name=dir::$(yarn cache dir)"
254254
- name: Cache node dependencies
255-
uses: actions/cache@v1
255+
uses: actions/cache@v2
256256
with:
257257
path: ${{ steps.yarn-cache.outputs.dir }}
258258
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@@ -287,12 +287,11 @@ jobs:
287287
DRAFT: false
288288
NAME: ${{ env.TAG_NAME }}
289289
TAG: ${{ env.TAG_NAME }}
290-
- uses: 8398a7/action-slack@v2
290+
- uses: 8398a7/action-slack@v3
291291
with:
292292
status: ${{ job.status }}
293293
text: ${{ format('<{0}>', steps.drafter.outputs.html_url) }}
294294
env:
295-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
296295
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
297296
if: success() && env.SLACK_WEBHOOK_URL
298297

@@ -304,10 +303,9 @@ jobs:
304303
if: always()
305304
steps:
306305
- uses: technote-space/workflow-conclusion-action@v1
307-
- uses: 8398a7/action-slack@v2
306+
- uses: 8398a7/action-slack@v3
308307
with:
309308
status: failure
310309
env:
311-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
312310
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
313311
if: env.WORKFLOW_CONCLUSION == 'failure' && env.SLACK_WEBHOOK_URL

.github/workflows/update-dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
if: env.RUNNING1
2424
with:
2525
CONFIG_FILENAME: workflow-settings.json
26-
- uses: technote-space/auto-cancel-redundant-job@v1
26+
- uses: technote-space/auto-cancel-redundant-workflow@v1
2727
if: env.RUNNING1
2828
with:
2929
EXCLUDE_MERGED: 'true'

0 commit comments

Comments
 (0)