Merge pull request #566 from gradle/gk/ptsImprovements

PTS improvements

Author: ribafish

.github/workflows/build-verification.yml

@@ -4,7 +4,6 @@ on:
   push:
     branches: [ main, citest ]
   pull_request:
-    branches: [ main ]
   workflow_dispatch:
 
 jobs:
@@ -16,7 +15,7 @@ jobs:
       - id: setup-matrix
         run: echo "matrix=$(jq -cM '.supportedVersions | keys' src/main/resources/versions.json | sed -e 's/\./_/g' -e 's/-/_/g')" >> $GITHUB_OUTPUT
       - name: debug
-        run: echo ${{ steps.setup-matrix.outputs.matrix }}
+        run: echo "matrix=${{ steps.setup-matrix.outputs.matrix }}"
     outputs:
       matrix: ${{ steps.setup-matrix.outputs.matrix }}
 
@@ -48,10 +47,15 @@ jobs:
       - name: Set up Gradle
         uses: gradle/gradle-build-action@v2
       - name: Run unit tests
-        run: ./gradlew test -x signPluginMavenPublication -x signAndroidCacheFixPluginPluginMarkerMavenPublication -Porg.gradle.java.installations.auto-download=false
+        run: >-
+            ./gradlew test
+            -x signPluginMavenPublication
+            -x signAndroidCacheFixPluginPluginMarkerMavenPublication
+            -Porg.gradle.java.installations.auto-download=false
+            -Dpts.mode=$PTS_MODE
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
-          ORG_GRADLE_PROJECT_isPTSEnabled: ${{ github.ref_name != 'main' }}
+          PTS_MODE: "${{ github.ref_name == 'main' && 'REMAINING_TESTS' || 'RELEVANT_TESTS' }}"
 
   android_version_tests:
     name: Android version tests
@@ -99,7 +103,12 @@ jobs:
       - name: Set up Gradle
         uses: gradle/gradle-build-action@v2
       - name: Run integration tests
-        run: ./gradlew testAndroid${{ matrix.versions }} -x signPluginMavenPublication -x signAndroidCacheFixPluginPluginMarkerMavenPublication -Porg.gradle.java.installations.auto-download=false
+        run: >-
+            ./gradlew testAndroid${{ matrix.versions }}
+            -x signPluginMavenPublication
+            -x signAndroidCacheFixPluginPluginMarkerMavenPublication
+            -Porg.gradle.java.installations.auto-download=false
+            -Dpts.mode=$PTS_MODE
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GE_SOLUTIONS_ACCESS_TOKEN }}
-          ORG_GRADLE_PROJECT_isPTSEnabled: ${{ github.ref_name != 'main' }}
+          PTS_MODE: "${{ github.ref_name == 'main' && 'REMAINING_TESTS' || 'RELEVANT_TESTS' }}"

build.gradle.kts

@@ -1,4 +1,7 @@
 import com.gradle.enterprise.gradleplugin.testretry.retry
+import com.gradle.enterprise.gradleplugin.testselection.PredictiveTestSelectionProfile.FAST
+import com.gradle.enterprise.gradleplugin.testselection.PredictiveTestSelectionProfile.CONSERVATIVE
+import com.gradle.enterprise.gradleplugin.testselection.PredictiveTestSelectionProfile.STANDARD
 import groovy.json.JsonSlurper
 
 plugins {
@@ -113,7 +116,13 @@ tasks.withType<Test>().configureEach {
     }
 
     predictiveSelection {
-        enabled = providers.gradleProperty("isPTSEnabled").map { it != "false" }.orElse(false)
+        enabled = providers.gradleProperty("isPTSEnabled").map { it != "false" }.orElse(true)
+    }
+}
+
+tasks.test {
+    predictiveSelection {
+        profile = STANDARD
     }
 }
 
@@ -135,6 +144,10 @@ getSupportedVersions().keys.forEach { androidVersion ->
                 languageVersion = JavaLanguageVersion.of(17)
             }
         }
+
+        predictiveSelection {
+            profile = FAST
+        }
     }
 
     tasks.check {

gradle.properties

@@ -4,4 +4,4 @@ org.gradle.configuration-cache=true
 org.gradle.jvmargs=-Duser.language=en -Duser.country=US -Dfile.encoding=UTF-8
 org.gradle.kotlin.dsl.allWarningsAsErrors=true
 
-isPTSEnabled=false
+isPTSEnabled=true

release/changes.md

@@ -1,3 +1,3 @@
 - [NEW] Run tests against AGP 8.3.0-alpha01
 - [NEW] Run tests against AGP 8.2.0-beta01
-- [NEW] Run tests against AGP 8.1.1
+- [NEW] Run tests against AGP 8.1.1