Enable PTS' remaining tests mode and code coverage merging on CI

Author: marcphilipp

.github/actions/run-gradle/action.yml

@@ -21,7 +21,8 @@ runs:
       run: |
         ./gradlew \
         -Porg.gradle.java.installations.auto-download=false \
-        -Pjunit.develocity.predictiveTestSelection.enabled=${{ github.event_name == 'pull_request' }} \
+        -Pjunit.develocity.predictiveTestSelection.enabled=true \
+        -Pjunit.develocity.predictiveTestSelection.selectRemainingTests=${{ github.event_name != 'pull_request' }} \
         "-Dscan.value.GitHub job=${{ github.job }}" \
         javaToolchains \
         ${{ inputs.arguments }}

gradle/plugins/build-parameters/build.gradle.kts

@@ -41,6 +41,11 @@ buildParameters {
 					description = "Whether or not to use Predictive Test Selection for selecting tests to execute"
 					defaultValue = true
 				}
+				bool("selectRemainingTests") {
+					// see https://docs.gradle.com/develocity/predictive-test-selection/#gradle-selection-mode
+					description = "Whether or not to use PTS' 'remaining tests' selection mode"
+					defaultValue = false
+				}
 			}
 			group("testDistribution") {
 				bool("enabled") {

gradle/plugins/common/src/main/kotlin/junitbuild.testing-conventions.gradle.kts

@@ -1,4 +1,5 @@
 import com.gradle.develocity.agent.gradle.internal.test.PredictiveTestSelectionConfigurationInternal
+import com.gradle.develocity.agent.gradle.test.PredictiveTestSelectionMode
 import org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
 import org.gradle.api.tasks.testing.logging.TestLogEvent.FAILED
 import org.gradle.internal.os.OperatingSystem
@@ -36,9 +37,15 @@ tasks.withType<Test>().configureEach {
 		predictiveTestSelection {
 			enabled = buildParameters.junit.develocity.predictiveTestSelection.enabled
 
+			if (buildParameters.junit.develocity.predictiveTestSelection.selectRemainingTests) {
+				mode = PredictiveTestSelectionMode.REMAINING_TESTS
+			}
+
 			// Ensure PTS works when publishing Build Scans to scans.gradle.com
 			this as PredictiveTestSelectionConfigurationInternal
 			server = uri("https://ge.junit.org")
+
+			mergeCodeCoverage = true
 		}
 	}
 	systemProperty("java.util.logging.manager", "org.apache.logging.log4j.jul.LogManager")