Reduce compatibility tests duration

whyoleg · Aug 27, 2024 · e9d58aa · e9d58aa
1 parent f5897a7
commit e9d58aa
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 32 deletions.
diff --git a/.github/workflows/run-tests-compatibility.yml b/.github/workflows/run-tests-compatibility.yml
@@ -18,27 +18,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest' ]
-        target: [ 'jvmAll', 'js', 'native' ]
+        target: [ 'jvm', 'js', 'native' ]
         include:
           - os: 'macos-latest'
             target: 'macos'
-          - os: 'macos-latest'
-            target: 'ios'
-          - os: 'macos-latest'
-            target: 'watchos'
-          - os: 'macos-latest'
-            target: 'tvos'
           - os: 'windows-latest'
             target: 'native'
-          - os: 'ubuntu-latest'
-            target: 'connectedAndroid'
-            android-api-level: 21
-          - os: 'ubuntu-latest'
-            target: 'connectedAndroid'
-            android-api-level: 27
-          - os: 'ubuntu-latest'
-            target: 'connectedAndroid'
-            android-api-level: 33
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-environment
@@ -81,27 +66,12 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest' ]
-        target: [ 'jvmAll', 'js', 'native' ]
+        target: [ 'jvm', 'js', 'native' ]
         include:
           - os: 'macos-latest'
             target: 'macos'
-          - os: 'macos-latest'
-            target: 'ios'
-          - os: 'macos-latest'
-            target: 'watchos'
-          - os: 'macos-latest'
-            target: 'tvos'
           - os: 'windows-latest'
             target: 'native'
-          - os: 'ubuntu-latest'
-            target: 'connectedAndroid'
-            android-api-level: 21
-          - os: 'ubuntu-latest'
-            target: 'connectedAndroid'
-            android-api-level: 27
-          - os: 'ubuntu-latest'
-            target: 'connectedAndroid'
-            android-api-level: 33
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-environment

diff --git a/build-logic/src/main/kotlin/ckbuild.multiplatform-provider-tests.gradle.kts b/build-logic/src/main/kotlin/ckbuild.multiplatform-provider-tests.gradle.kts
@@ -49,6 +49,17 @@ registerTestAggregationTask(
     targetFilter = { it.platformType == KotlinPlatformType.jvm }
 )
 
+// test only on min and max JDK versions
+registerTestAggregationTask(
+    name = "jvmProviderTest",
+    taskDependencies = {
+        tasks.withType<KotlinJvmTest>().matching {
+            it.javaLauncher.get().metadata.languageVersion.asInt() in setOf(8, 21)
+        }
+    },
+    targetFilter = { it.platformType == KotlinPlatformType.jvm }
+)
+
 registerTestAggregationTask(
     name = "nativeProviderTest",
     taskDependencies = { tasks.withType<KotlinNativeTest>().matching { it.enabled } },