Skip to content

Commit 0a68068

Browse files
authored
Merge pull request #43 from TrueNine/dev
ci: 更新 GitHub Actions 并发组和条件执行
2 parents a722359 + 3c4c8be commit 0a68068

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ on:
66
- main
77

88
concurrency:
9-
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
9+
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}-${{ github.event.pull_request.merged }}
1010
cancel-in-progress: true
1111

1212
jobs:
1313
build:
1414
runs-on: ubuntu-24.04
15+
if: github.event.pull_request.merged == false
1516
steps:
1617
- uses: actions/checkout@v4
1718

.github/workflows/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ on:
66
- main
77

88
concurrency:
9-
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
9+
group: ${{ github.workflow }}-${{ github.event.pull_request.number }}-${{ github.event.pull_request.merged }}
1010
cancel-in-progress: true
1111

1212
jobs:
1313
test:
1414
runs-on: ubuntu-24.04
15+
if: github.event.pull_request.merged == false
1516
steps:
1617
- uses: actions/checkout@v4
1718

0 commit comments

Comments
 (0)