run wasm tests

rsocket · Dec 1, 2024 · 63fcb47 · 63fcb47
1 parent 6ad5287
commit 63fcb47
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -33,16 +33,10 @@ jobs:
       fail-fast: false
       matrix:
         os: [ 'ubuntu-latest' ]
-        target: [ 'jvm', 'jvm11', 'jvm17', 'jvm21', 'js', 'native' ]
+        target: [ 'jvmAll', 'jsAndWasm', 'native' ]
         include:
           - os: 'macos-latest'
-            target: 'macos'
-          - os: 'macos-latest'
-            target: 'ios'
-          - os: 'macos-latest'
-            target: 'watchos'
-          - os: 'macos-latest'
-            target: 'tvos'
+            target: 'native'
           - os: 'windows-latest'
             target: 'native'
     steps:

diff --git a/build-logic/src/main/kotlin/rsocketbuild.multiplatform-base.gradle.kts b/build-logic/src/main/kotlin/rsocketbuild.multiplatform-base.gradle.kts
@@ -18,6 +18,7 @@ import org.jetbrains.kotlin.gradle.*
 import org.jetbrains.kotlin.gradle.plugin.*
 import org.jetbrains.kotlin.gradle.plugin.mpp.*
 import org.jetbrains.kotlin.gradle.targets.js.ir.*
+import org.jetbrains.kotlin.gradle.targets.js.testing.*
 import org.jetbrains.kotlin.gradle.targets.jvm.*
 import org.jetbrains.kotlin.gradle.targets.jvm.tasks.*
 import org.jetbrains.kotlin.gradle.targets.native.tasks.*
@@ -111,6 +112,12 @@ registerTestAggregationTask(
     targetFilter = { it.platformType == KotlinPlatformType.jvm }
 )
 
+registerTestAggregationTask(
+    name = "jsAndWasmTest",
+    taskDependencies = { tasks.withType<KotlinJsTest>() },
+    targetFilter = { it.platformType == KotlinPlatformType.js || it.platformType == KotlinPlatformType.wasm }
+)
+
 registerTestAggregationTask(
     name = "nativeTest",
     taskDependencies = { tasks.withType<KotlinNativeTest>().matching { it.enabled } },