Skip to content

Commit 8533fba

Browse files
committed
chore(ci): use linux images for tests
1 parent 13f3806 commit 8533fba

File tree

3 files changed

+29
-22
lines changed

3 files changed

+29
-22
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
test-jvm:
4040
name: Test JVM
41-
runs-on: macos-11
41+
runs-on: ubuntu-latest
4242
needs: lint
4343
strategy:
4444
matrix:

build-support/src/main/kotlin/Platforms.kt

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import org.gradle.kotlin.dsl.creating
22
import org.gradle.kotlin.dsl.getValue
33
import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension
4+
import org.jetbrains.kotlin.konan.target.HostManager
45

56
fun KotlinMultiplatformExtension.native() {
67
sourceSets.apply {
@@ -17,24 +18,26 @@ fun KotlinMultiplatformExtension.native() {
1718
}
1819

1920
// Darwin targets
20-
val darwinMain by creating { dependsOn(nativeMain) }
21-
val darwinTest by creating { dependsOn(nativeTest) }
22-
listOf(
23-
iosX64(),
24-
iosArm64(),
25-
iosSimulatorArm64(),
26-
macosX64(),
27-
macosArm64(),
28-
tvosX64(),
29-
tvosArm64(),
30-
tvosSimulatorArm64(),
31-
watchosArm32(),
32-
watchosArm64(),
33-
watchosX64(),
34-
watchosSimulatorArm64(),
35-
).forEach { target ->
36-
getByName("${target.name}Main").dependsOn(darwinMain)
37-
getByName("${target.name}Test").dependsOn(darwinTest)
21+
if (HostManager.hostIsMac) {
22+
val darwinMain by creating { dependsOn(nativeMain) }
23+
val darwinTest by creating { dependsOn(nativeTest) }
24+
listOf(
25+
iosX64(),
26+
iosArm64(),
27+
iosSimulatorArm64(),
28+
macosX64(),
29+
macosArm64(),
30+
tvosX64(),
31+
tvosArm64(),
32+
tvosSimulatorArm64(),
33+
watchosArm32(),
34+
watchosArm64(),
35+
watchosX64(),
36+
watchosSimulatorArm64(),
37+
).forEach { target ->
38+
getByName("${target.name}Main").dependsOn(darwinMain)
39+
getByName("${target.name}Test").dependsOn(darwinTest)
40+
}
3841
}
3942
}
4043
}

openai-client/build.gradle.kts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import org.jetbrains.kotlin.konan.target.HostManager
2+
13
plugins {
24
kotlin("multiplatform")
35
kotlin("plugin.serialization")
@@ -72,9 +74,11 @@ kotlin {
7274
implementation(libs.ktor.client.curl)
7375
}
7476
}
75-
val darwinTest by getting {
76-
dependencies {
77-
implementation(libs.ktor.client.darwin)
77+
if (HostManager.hostIsMac) {
78+
val darwinTest by getting {
79+
dependencies {
80+
implementation(libs.ktor.client.darwin)
81+
}
7882
}
7983
}
8084
}

0 commit comments

Comments
 (0)