.

com-lihaoyi · Dec 13, 2024 · c39901c · c39901c
1 parent 0d1dd9f
commit c39901c
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 79 deletions.
diff --git a/.github/workflows/post-build-selective.yml b/.github/workflows/post-build-selective.yml
@@ -36,10 +36,7 @@ jobs:
           path: .
           name: ${{ inputs.os }}-artifact
 
-#      - run: chmod -R 777 .
-      - run: ./mill -i -k selective.prepare main.__.test
-
-      - run: cat out/mill-selective-execution.json
+      - run: chmod -R 777 . # normalize permissions before and after upload/download-artifact
 
       - uses: actions/download-artifact@v4
         with:

diff --git a/.github/workflows/pre-build.yml b/.github/workflows/pre-build.yml
@@ -27,11 +27,7 @@ jobs:
         with:
           ref: ${{ github.base_ref }}
 
-#      - run: chmod -R 777 .
-
-      - run: ./mill -i -k selective.prepare main.__.test
-
-      - run: cat out/mill-selective-execution.json
+      - run: chmod -R 777 . # normalize permissions before and after upload/download-artifact
 
       - uses: actions/[email protected]
         with:
@@ -43,7 +39,7 @@ jobs:
 
       - uses: coursier/cache-action@v6
 
-#      - run: ./mill -i -k ${{ inputs.millargs }}
+      - run: ./mill -i -k ${{ inputs.millargs }}
 
       - uses: actions/[email protected]
         with:

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -53,66 +53,66 @@ jobs:
           # each test on each Java version and each operating system
           # We also try to group tests together to manually balance out the runtimes of each jobs
           - java-version: 17
-            millargs: "'main.__.test'"
+            millargs: "'{main,scalalib,testrunner,bsp,testkit}.__.test'"
             install-android-sdk: false
 
-#          - java-version: '11'
-#            millargs: "'{scalajslib,scalanativelib,kotlinlib,pythonlib,javascriptlib}.__.test'"
-#            install-android-sdk: false
-#
-#          - java-version: 17
-#            millargs: "contrib.__.test"
-#            install-android-sdk: false
-#
-#          - java-version: 17
-#            millargs: "'example.javalib.__.local.test'"
-#            install-android-sdk: false
-#
-#          - java-version: 17
-#            millargs: "'example.scalalib.__.local.test'"
-#            install-android-sdk: false
-#
-#          - java-version: 17
-#            millargs: "'example.kotlinlib.__.local.test'"
-#            install-android-sdk: false
-#
-#          - java-version: 17
-#            millargs: "'example.android.__.local.test'"
-#            install-android-sdk: true
-#
-#          - java-version: 17
-#            millargs: "'example.{pythonlib,javascriptlib}.__.local.test'"
-#            install-android-sdk: false
-#
-#          - java-version: '11'
-#            millargs: "'example.thirdparty[{mockito,acyclic,commons-io}].local.test'"
-#            install-android-sdk: false
-#
-#          - java-version: 17
-#            millargs: "'example.thirdparty[{fansi,jimfs,netty,gatling}].local.test'"
-#            install-android-sdk: false
-#
-#          - java-version: '17'
-#            millargs: "'example.thirdparty[arrow].local.test'"
-#            install-android-sdk: false
-#
-#          - java-version: '11'
-#            millargs: "'example.{cli,fundamentals,depth,extending}.__.local.test'"
-#            install-android-sdk: false
-#            # Most of these integration tests should not depend on which mode they
-#            # are run in, so just run them in `local`
-#          - java-version: '17'
-#            millargs: "'integration.{failure,feature,ide}.__.local.test'"
-#            install-android-sdk: false
-#            # These invalidation tests need to be exercised in both execution modes
-#            # to make sure they work with and without -i/--no-server being passed
-#          - java-version: 17
-#            millargs: "'integration.invalidation.__.fork.test'"
-#            install-android-sdk: false
-#
-#          - java-version: 17
-#            millargs: "'integration.invalidation.__.server.test'"
-#            install-android-sdk: false
+          - java-version: 11
+            millargs: "'{scalajslib,scalanativelib,kotlinlib,pythonlib,javascriptlib}.__.test'"
+            install-android-sdk: false
+
+          - java-version: 17
+            millargs: "contrib.__.test"
+            install-android-sdk: false
+
+          - java-version: 17
+            millargs: "'example.javalib.__.local.test'"
+            install-android-sdk: false
+
+          - java-version: 17
+            millargs: "'example.scalalib.__.local.test'"
+            install-android-sdk: false
+
+          - java-version: 17
+            millargs: "'example.kotlinlib.__.local.test'"
+            install-android-sdk: false
+
+          - java-version: 17
+            millargs: "'example.android.__.local.test'"
+            install-android-sdk: true
+
+          - java-version: 17
+            millargs: "'example.{pythonlib,javascriptlib}.__.local.test'"
+            install-android-sdk: false
+
+          - java-version: 11
+            millargs: "'example.thirdparty[{mockito,acyclic,commons-io}].local.test'"
+            install-android-sdk: false
+
+          - java-version: 17
+            millargs: "'example.thirdparty[{fansi,jimfs,netty,gatling}].local.test'"
+            install-android-sdk: false
+
+          - java-version: '17'
+            millargs: "'example.thirdparty[arrow].local.test'"
+            install-android-sdk: false
+
+          - java-version: 11
+            millargs: "'example.{cli,fundamentals,depth,extending}.__.local.test'"
+            install-android-sdk: false
+            # Most of these integration tests should not depend on which mode they
+            # are run in, so just run them in `local`
+          - java-version: '17'
+            millargs: "'integration.{failure,feature,ide}.__.local.test'"
+            install-android-sdk: false
+            # These invalidation tests need to be exercised in both execution modes
+            # to make sure they work with and without -i/--no-server being passed
+          - java-version: 17
+            millargs: "'integration.invalidation.__.fork.test'"
+            install-android-sdk: false
+
+          - java-version: 17
+            millargs: "'integration.invalidation.__.server.test'"
+            install-android-sdk: false
 
     uses: ./.github/workflows/post-build-selective.yml
     with:
@@ -128,16 +128,16 @@ jobs:
         include:
           # just run a subset of examples/ on Windows, because for some reason running
           # the whole suite can take hours on windows v.s. half an hour on linux
-          - java-version: '11'
-            millargs: '"main.__.test"'
-#          - java-version: '11'
-#            millargs: '"example.scalalib.basic.__.fork.test"'
-#          - java-version: 17
-#            millargs: "'integration.{feature,failure}[_].fork.test'"
-#          - java-version: '11'
-#            millargs: "'integration.invalidation[_].server.test'"
-#          - java-version: '11'
-#            millargs: "contrib.__.test"
+          - java-version: 11
+            millargs: '"{main,scalalib,bsp}.__.test"'
+          - java-version: 11
+            millargs: '"example.scalalib.basic.__.fork.test"'
+          - java-version: 17
+            millargs: "'integration.{feature,failure}[_].fork.test'"
+          - java-version: 11
+            millargs: "'integration.invalidation[_].server.test'"
+          - java-version: 11
+            millargs: "contrib.__.test"
 
     uses: ./.github/workflows/post-build-selective.yml
     with:
@@ -152,7 +152,7 @@ jobs:
       matrix:
         include:
           # bootstrap tests
-          - java-version: '11' # Have one job on oldest JVM
+          - java-version: 11 # Have one job on oldest JVM
             buildcmd: ci/test-mill-dev.sh && ci/test-mill-release.sh && ./mill -i -k __.ivyDepsTree && ./mill -i -k __.ivyDepsTree --withRuntime
           - java-version: 17 # Have one job on default JVM
             buildcmd: ci/test-mill-bootstrap.sh