Skip to content

Commit 44324e5

Browse files
authored
CI: update workflow (#293)
This PR... 1. bumps action versions 2. replaces styfle/cancel-workflow-action action by built-in concurrency feature to reduce external dependencies.
1 parent a2703dc commit 44324e5

2 files changed

Lines changed: 11 additions & 17 deletions

File tree

‎.github/workflows/merge.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ jobs:
1111
contents: write
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v5
15-
- uses: actions/github-script@v7
14+
- uses: actions/checkout@v6
15+
- uses: actions/github-script@v9
1616
with:
1717
script: |
1818
await github.rest.repos.merge({

‎.github/workflows/test.yaml‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,21 @@ on:
1212
- master
1313
workflow_dispatch:
1414

15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.ref }}
17+
cancel-in-progress: ${{ github.ref != 'refs/heads/master' }}
18+
1519
jobs:
16-
cancel-previous-runs:
17-
runs-on: ubuntu-latest
18-
steps:
19-
- uses: styfle/cancel-workflow-action@0.12.1
20-
with:
21-
access_token: ${{ github.token }}
2220

2321
test-both-actions-and-package:
24-
needs: cancel-previous-runs
2522
strategy:
2623
fail-fast: false
2724
matrix:
2825
st-version: [3, 4]
2926
os: ["ubuntu-latest", "macOS-latest", "windows-latest"]
3027
runs-on: ${{ matrix.os }}
3128
steps:
32-
- uses: actions/checkout@v4
29+
- uses: actions/checkout@v6
3330
- uses: "./actions/setup"
3431
with:
3532
sublime-text-version: ${{ matrix.st-version }}
@@ -41,44 +38,41 @@ jobs:
4138
token: ${{secrets.CODECOV_TOKEN}}
4239

4340
test-actions: # with latest released unittesting
44-
needs: cancel-previous-runs
4541
strategy:
4642
fail-fast: false
4743
matrix:
4844
os: ["ubuntu-latest", "macOS-latest", "windows-latest"]
4945
runs-on: ${{ matrix.os }}
5046
steps:
51-
- uses: actions/checkout@v4
47+
- uses: actions/checkout@v6
5248
- uses: "./actions/setup"
5349
with:
5450
install-package: false
5551
- uses: "./actions/run-tests"
5652

5753
test-package: # with v1 actions
58-
needs: cancel-previous-runs
5954
strategy:
6055
fail-fast: false
6156
matrix:
6257
os: ["ubuntu-latest", "macOS-latest", "windows-latest"]
6358
runs-on: ${{ matrix.os }}
6459
steps:
65-
- uses: actions/checkout@v4
60+
- uses: actions/checkout@v6
6661
- uses: SublimeText/UnitTesting/actions/setup@v1
6762
- uses: SublimeText/UnitTesting/actions/run-tests@v1
6863

6964
test-as-extra-package:
70-
needs: cancel-previous-runs
7165
strategy:
7266
fail-fast: false
7367
matrix:
7468
os: ["ubuntu-latest", "windows-latest"]
7569
runs-on: ${{ matrix.os }}
7670
steps:
77-
- uses: actions/checkout@v4
71+
- uses: actions/checkout@v6
7872
with:
7973
repository: randy3k/UnitTesting-example
8074
path: UnitTesting-example
81-
- uses: actions/checkout@v4
75+
- uses: actions/checkout@v6
8276
with:
8377
path: UnitTesting
8478
- uses: "./UnitTesting/actions/setup"

0 commit comments

Comments
 (0)