Skip to content

Commit cb360d7

Browse files
committed
try to fix post-merge jobs
1 parent 404bd84 commit cb360d7

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

.github/workflows/post-build-selective.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ jobs:
7070
- run: ./mill -i -k selective.resolve ${{ inputs.millargs }}
7171

7272
- run: ./mill -i -k selective.run ${{ inputs.millargs }}
73+
if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'run-all-tests') }}
74+
75+
- run: ./mill -i -k ${{ inputs.millargs }}
76+
if: ${{ github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-all-tests') }}
7377

7478
- run: 'taskkill -f -im java* && rm -rf out/mill-server/*'
7579
if: startsWith(inputs.os, 'windows')

.github/workflows/pre-build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ jobs:
3636
shell: bash
3737

3838
- run: ./mill -i -k selective.prepare ${{ inputs.prepareargs }}
39-
if: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'run-all-tests') }}
4039

4140
- uses: actions/[email protected]
4241
with:

0 commit comments

Comments
 (0)