Skip to content

Commit 0920e09

Browse files
committed
Revert "try to fix post-merge jobs"
This reverts commit cb360d7. Try to remove redundant checkout actions that might be conflicting with download-artifact
1 parent cb360d7 commit 0920e09

File tree

4 files changed

+1
-9
lines changed

4 files changed

+1
-9
lines changed

.github/actions/post-build-setup/action.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ runs:
1919
java-version: ${{ inputs.java-version }}
2020
distribution: temurin
2121

22-
- uses: actions/checkout@v4
23-
2422
# Need to fix cached artifact file permissions because github actions screws it up
2523
# https://github.com/actions/upload-artifact/issues/38
2624
- run: "chmod -R +x ."

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ jobs:
2121
continue-on-error: false
2222
timeout-minutes: ${{ inputs.timeout-minutes }}
2323
steps:
24-
- uses: actions/checkout@v4
25-
2624
- uses: ./.github/actions/post-build-setup
2725
with:
2826
java-version: ${{ inputs.java-version }}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ jobs:
2424
continue-on-error: false
2525
timeout-minutes: ${{ inputs.timeout-minutes }}
2626
steps:
27-
- uses: actions/checkout@v4
2827

2928
- uses: ./.github/actions/post-build-setup
3029
with:
@@ -70,10 +69,6 @@ jobs:
7069
- run: ./mill -i -k selective.resolve ${{ inputs.millargs }}
7170

7271
- 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') }}
7772

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

.github/workflows/pre-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ 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') }}
3940

4041
- uses: actions/[email protected]
4142
with:

0 commit comments

Comments
 (0)