From e328ee13f78abbc52b409aa2d1aace5427dc5ddc Mon Sep 17 00:00:00 2001 From: Alexander Ioffe Date: Wed, 11 Sep 2024 16:04:48 -0400 Subject: [PATCH] Only specific tests for IOs --- .github/workflows/ci.yaml | 34 +++++++++++++++++++---------- terpal-sql-android/build.gradle.kts | 14 +++++------- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 138efa4..21de726 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -17,17 +17,27 @@ jobs: distribution: 'adopt' - name: Validate Gradle wrapper uses: gradle/wrapper-validation-action@v1 - - run: ./gradlew clean build --stacktrace -Pnosign -PisCI + - name: 'Run Linux Tests' + if: matrix.os == 'ubuntu-latest' + run: ./gradlew clean build --stacktrace -PisCI -Pnosign -# - name: 'Run Linux Tests' -# if: matrix.os == 'ubuntu-latest' -# run: ./gradlew clean build --stacktrace -PisCI -Pnosign -# -# - name: 'Run MacOS Tests' -# if: matrix.os == 'macOS-latest' -# run: ./gradlew clean build --stacktrace -PisCI -Pnosign -# -# - name: 'Run windows tests' -# if: matrix.os == 'windows-latest' -# run: ./gradlew mingwX64Test --stacktrace -PisCI -Pnosign + - name: 'Run MacOS Tests' + if: matrix.os == 'macOS-latest' + run: >- + ./gradlew + macosX64Test + macosArm64Test + iosX64Test + iosArm64Test + iosSimulatorArm64Test + tvosX64Test + tvosArm64Test + watchosX64Test + watchosArm32Test + watchosArm64Test + --stacktrace -PisCI -Pnosign + + - name: 'Run windows tests' + if: matrix.os == 'windows-latest' + run: ./gradlew mingwX64Test --stacktrace -PisCI -Pnosign diff --git a/terpal-sql-android/build.gradle.kts b/terpal-sql-android/build.gradle.kts index f1f14c7..921c4ae 100644 --- a/terpal-sql-android/build.gradle.kts +++ b/terpal-sql-android/build.gradle.kts @@ -2,7 +2,6 @@ import org.gradle.api.tasks.testing.logging.TestExceptionFormat import org.gradle.api.tasks.testing.logging.TestLogEvent import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi import org.jetbrains.kotlin.gradle.dsl.JvmTarget -import org.jetbrains.kotlin.konan.target.HostManager plugins { kotlin("multiplatform") @@ -47,15 +46,13 @@ android { } kotlin { - if (HostManager.hostIsLinux) { - androidTarget { - compilations.all { - kotlinOptions { - jvmTarget = "17" - } + androidTarget { + compilations.all { + kotlinOptions { + jvmTarget = "17" } } - + } sourceSets { @@ -115,7 +112,6 @@ kotlin { // } //} } - } } dependencies {