Skip to content

Commit 04d0270

Browse files
authored
Configure skip-duplicates jobs to not skip duplicates (CleverRaven#79764)
1 parent b5728d0 commit 04d0270

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

.github/workflows/clang-tidy.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
uses: fkirc/skip-duplicate-actions@master
2828
with:
2929
cancel_others: 'true'
30+
skip_after_successful_duplicate: 'false'
3031
paths: '[ "**.cpp", "**.h", "**.c", "**/CMakeLists.txt", "**/Makefile", "**.hpp", "**.cmake", "build-scripts/clang-tidy-build.sh", "build-scripts/clang-tidy-run.sh", "build-scripts/clang-tidy-wrapper.sh", "build-scripts/get_affected_files.py", ".github/workflows/clang-tidy.yml" ]'
3132

3233

@@ -80,17 +81,16 @@ jobs:
8081
TILES: 1
8182
SOUND: 1
8283
LOCALIZE: 1
84+
if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' && github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
8385
steps:
8486
- name: install dependencies
85-
if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' && github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
8687
run: |
8788
sudo apt-get update
8889
sudo apt install clang-18 clang-tidy-18 cmake ccache jq
8990
sudo apt install libflac-dev libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev libsdl2-mixer-dev libpulse-dev gettext
9091
- name: checkout repository
9192
uses: actions/checkout@v4
9293
- name: download plugin from the previous job in this workflow run
93-
if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' && github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
9494
uses: actions/download-artifact@v4
9595
with:
9696
name: cata-analyzer-plugin
@@ -115,7 +115,6 @@ jobs:
115115
fs.writeFileSync("files_changed", files.join('\n') + '\n');
116116
- uses: ammaraskar/gcc-problem-matcher@master
117117
- name: run clang-tidy
118-
if: ${{ needs.skip-duplicates.outputs.should_skip != 'true' && github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
119118
run: bash ./build-scripts/clang-tidy-run.sh
120119
- name: show most time consuming checks
121120
if: always()

.github/workflows/matrix.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jobs:
6363
- id: skip_check
6464
uses: fkirc/skip-duplicate-actions@master
6565
with:
66+
skip_after_successful_duplicate: 'false'
6667
paths_ignore: '["android/**", "build-data/osx/**", "doc/**", "doxygen_doc/**", "lgtm/**", "msvc-**", "object_creator/**", "tools/**", "utilities/**", "data/**", "lang/**"]'
6768
skip-duplicates-data:
6869
continue-on-error: true
@@ -74,6 +75,7 @@ jobs:
7475
- id: skip_check
7576
uses: fkirc/skip-duplicate-actions@master
7677
with:
78+
skip_after_successful_duplicate: 'false'
7779
paths_ignore: '["android/**", "build-data/osx/**", "doc/**", "doxygen_doc/**", "lgtm/**", "msvc-**", "object_creator/**", "tools/**", "utilities/**"]'
7880
matrix-variables:
7981
permissions:

0 commit comments

Comments
 (0)