Skip to content

Commit 38ef620

Browse files
committed
Build cleanup
1 parent b2765eb commit 38ef620

File tree

3 files changed

+13
-37
lines changed

3 files changed

+13
-37
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,5 @@ jobs:
5555
5656
- name: Build
5757
run: ./gradlew build --no-daemon --stacktrace
58-
59-
- name: Build Old Memory Model
60-
run: ./gradlew build --no-daemon --stacktrace -Pkotlin.native.binary.memoryModel=experimental
6158
env:
6259
GRADLE_OPTS: -Dorg.gradle.configureondemand=true -Dkotlin.incremental=false -Dorg.gradle.jvmargs="-Xmx3g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -XX:MaxMetaspaceSize=512m"

.github/workflows/deploy.yml

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,23 +44,9 @@ jobs:
4444
shell: bash
4545
run: |
4646
echo "c:\msys64\mingw64\bin" >> $GITHUB_PATH
47-
- name: Publish Mac Artifacts
47+
- name: Publish
4848
if: matrix.os == 'macOS-latest'
49-
run: ./gradlew publishMac --no-daemon --stacktrace
50-
env:
51-
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
52-
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
53-
ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
54-
- name: Publish Windows Artifacts
55-
if: matrix.os == 'windows-latest'
56-
run: ./gradlew publishWindows --no-daemon --stacktrace
57-
env:
58-
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
59-
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
60-
ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
61-
- name: Publish Linux Artifacts
62-
if: matrix.os == 'ubuntu-18.04'
63-
run: ./gradlew publishLinux --no-daemon --stacktrace
49+
run: ./gradlew publish --no-daemon --stacktrace
6450
env:
6551
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
6652
ORG_GRADLE_PROJECT_SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}

sqliter-driver/build.gradle.kts

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ fun configInterop(target: org.jetbrains.kotlin.gradle.plugin.mpp.KotlinNativeTar
2323
"-linker-options",
2424
"-lsqlite3 -L/usr/lib/x86_64-linux-gnu -L/usr/lib"
2525
)
26+
2627
HostManager.hostIsMingw -> listOf("-linker-options", "-lsqlite3 -Lc:\\msys64\\mingw64\\lib")
2728
else -> listOf("-linker-options", "-lsqlite3")
2829
}
@@ -102,9 +103,11 @@ kotlin {
102103
target.compilations.getByName("main").defaultSourceSet.dependsOn(mingwMain)
103104
target.compilations.getByName("test").defaultSourceSet.dependsOn(nativeCommonTest)
104105
}
106+
105107
target.name.startsWith("linux") -> {
106108
target.compilations.getByName("test").defaultSourceSet.dependsOn(nativeCommonTest)
107109
}
110+
108111
else -> {
109112
target.compilations.getByName("main").defaultSourceSet.dependsOn(appleMain)
110113
target.compilations.getByName("test").defaultSourceSet.dependsOn(nativeCommonTest)
@@ -118,23 +121,13 @@ tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinNativeCompile> {
118121
kotlinOptions.freeCompilerArgs += "-Xexpect-actual-classes"
119122
}
120123

121-
if(!HostManager.hostIsLinux) {
122-
tasks.findByName("linuxX64Test")?.enabled = false
123-
tasks.findByName("linuxArm64Test")?.enabled = false
124-
tasks.findByName("linkDebugTestLinuxX64")?.enabled = false
125-
tasks.findByName("linkDebugTestLinuxArm64")?.enabled = false
126-
tasks.findByName("publishLinuxX64PublicationToMavenRepository")?.enabled = false
127-
tasks.findByName("publishLinuxArm64PublicationToMavenRepository")?.enabled = false
128-
}
129-
130-
if(!HostManager.hostIsMingw) {
131-
tasks.findByName("mingwX64Test")?.enabled = false
132-
tasks.findByName("linkDebugTestMingwX64")?.enabled = false
133-
tasks.findByName("publishMingwX64PublicationToMavenRepository")?.enabled = false
134-
}
124+
listOf(
125+
"linuxX64Test",
126+
"linuxArm64Test",
127+
"linkDebugTestLinuxX64",
128+
"linkDebugTestLinuxArm64",
129+
"mingwX64Test",
130+
"linkDebugTestMingwX64",
131+
).forEach { tasks.findByName(it)?.enabled = false }
135132

136133
apply(from = "../gradle/gradle-mvn-mpp-push.gradle")
137-
138-
tasks.register("publishMac"){
139-
setDependsOn(tasks.filter { t -> t.name.startsWith("publish") && t.name.endsWith("ToMavenRepository") && !t.name.contains("Linux") }.map { it.name })
140-
}

0 commit comments

Comments
 (0)