.

com-lihaoyi · Dec 13, 2024 · 0c8156f · 0c8156f
1 parent daf61ac
commit 0c8156f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/post-build-selective.yml b/.github/workflows/post-build-selective.yml
@@ -57,11 +57,9 @@ jobs:
         with:
           log-accepted-android-sdk-licenses: false
 
-      - run: ./mill -i -k selective.resolve ${{ inputs.millargs }}; ./mill -i -k selective.run ${{ inputs.millargs }}
-        if: (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'run-all-tests'))
+      - run: ./mill -i -k selective.resolve ${{ inputs.millargs }}
 
-      - run: ./mill -i -k ${{ inputs.millargs }}
-        if: (github.event_name != 'pull_request' || contains(github.event.pull_request.labels.*.name, 'run-all-tests'))
+      - run: ./mill -i -k selective.run ${{ inputs.millargs }}
 
       - run: 'taskkill -f -im java* && rm -rf out/mill-server/*'
         if: startsWith(inputs.os, 'windows')

diff --git a/.github/workflows/pre-build.yml b/.github/workflows/pre-build.yml
@@ -32,7 +32,11 @@ jobs:
 
       - run: chmod -R 777 . # normalize permissions before and after upload/download-artifact
 
+      - run: echo -n > out/mill-selective-execution.json
+        shell: bash
+
       - run: ./mill -i -k selective.prepare ${{ inputs.prepareargs }}
+        if: github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'run-all-tests')
 
       - uses: actions/[email protected]
         with: