Skip to content

Commit 8506050

Browse files
authored
Merge pull request #885 from liangliangyy/dev
Fix GitHub Actions workflow configuration issues
2 parents fc9436f + 7788d3d commit 8506050

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

.github/workflows/django.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020

2121
concurrency:
2222
group: ${{ github.workflow }}-${{ github.ref }}
23-
cancel-in-progress: true
23+
cancel-in-progress: false
2424

2525
jobs:
2626
duplicate-check:
@@ -31,10 +31,10 @@ jobs:
3131
- id: skip_check
3232
uses: fkirc/skip-duplicate-actions@v5
3333
with:
34-
skip_after_successful_duplicate: 'true'
34+
skip_after_successful_duplicate: 'false'
3535
paths_ignore: '["**/*.md", "docs/**"]'
3636
do_not_skip: '["workflow_dispatch", "schedule"]'
37-
concurrent_skipping: 'same_content_newer'
37+
concurrent_skipping: 'outdated_runs'
3838
cancel_others: 'true'
3939

4040
test:
@@ -316,8 +316,8 @@ jobs:
316316
with:
317317
token: ${{ secrets.CODECOV_TOKEN }}
318318
file: ./coverage.xml
319-
flags: unittests
320-
name: codecov-${{ steps.test-info.outputs.test_name }}
319+
flags: unittests,${{ github.ref_name }}
320+
name: codecov-${{ github.ref_name }}-${{ steps.test-info.outputs.test_name }}
321321
fail_ci_if_error: false
322322
verbose: true
323323

@@ -326,8 +326,8 @@ jobs:
326326
uses: codecov/codecov-action@v5
327327
with:
328328
file: ./coverage.xml
329-
flags: unittests
330-
name: codecov-${{ steps.test-info.outputs.test_name }}-fallback
329+
flags: unittests,${{ github.ref_name }}
330+
name: codecov-${{ github.ref_name }}-${{ steps.test-info.outputs.test_name }}-fallback
331331
fail_ci_if_error: false
332332
verbose: true
333333

.github/workflows/frontend.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818

1919
concurrency:
2020
group: ${{ github.workflow }}-${{ github.ref }}
21-
cancel-in-progress: true
21+
cancel-in-progress: false
2222

2323
jobs:
2424
duplicate-check:
@@ -29,10 +29,10 @@ jobs:
2929
- id: skip_check
3030
uses: fkirc/skip-duplicate-actions@v5
3131
with:
32-
skip_after_successful_duplicate: 'true'
32+
skip_after_successful_duplicate: 'false'
3333
paths_ignore: '["**/*.md", "**/*.txt", "docs/**"]'
3434
do_not_skip: '["workflow_dispatch", "schedule"]'
35-
concurrent_skipping: 'same_content_newer'
35+
concurrent_skipping: 'outdated_runs'
3636
cancel_others: 'true'
3737

3838
build-and-validate:

codecov.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ coverage:
1212
target: auto
1313
threshold: 1%
1414
informational: true
15+
branches:
16+
- master
17+
- dev
1518
patch:
1619
default:
1720
target: auto

0 commit comments

Comments
 (0)