From fd730ce3de1bf8d11fa10c8e4517e76ea1e7b459 Mon Sep 17 00:00:00 2001 From: benkuly Date: Mon, 6 May 2024 20:53:32 +0200 Subject: [PATCH] add linuxArm64 support --- .gitlab-ci.yml | 10 +++++----- buildSrc/src/main/kotlin/targets.kt | 1 + trixnity-api-server/build.gradle.kts | 1 + trixnity-applicationservice/build.gradle.kts | 1 + .../build.gradle.kts | 1 + .../trixnity-clientserverapi-server/build.gradle.kts | 1 + trixnity-crypto-core/build.gradle.kts | 7 +++++++ trixnity-olm/build.gradle.kts | 4 ++++ .../trixnity-serverserverapi-server/build.gradle.kts | 1 + 9 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2b1a59dfd..cf563fdf5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -137,10 +137,10 @@ build:linux: - *if-merge-request script: - ./gradlew - compileKotlin{Jvm,Js,LinuxX64,MingwX64} + compileKotlin{Jvm,Js,LinuxX64,LinuxArm64,MingwX64} compileReleaseKotlinAndroid - compileTestKotlin{Jvm,Js,LinuxX64,MingwX64} - linkDebugTest{LinuxX64,MingwX64} + compileTestKotlin{Jvm,Js,LinuxX64,LinuxArm64,MingwX64} + linkDebugTest{LinuxX64,LinuxArm64,MingwX64} compileReleaseUnitTestKotlinAndroid --stacktrace @@ -174,7 +174,7 @@ test:linux: - *if-merge-request script: - ./gradlew - {jvm,js,linuxX64,mingwX64,testReleaseUnit}Test -x :trixnity-client:integration-tests:jvmTest + {jvm,js,linuxX64,LinuxArm64,mingwX64,testReleaseUnit}Test -x :trixnity-client:integration-tests:jvmTest --stacktrace test:integration-test: @@ -253,7 +253,7 @@ publish-snapshot:linux: - website/static/api/ script: - ./gradlew - publish{KotlinMultiplatform,Jvm,Js,LinuxX64,MingwX64,AndroidRelease,TrixnityPlatform}PublicationToSnapshotRepository + publish{KotlinMultiplatform,Jvm,Js,LinuxX64,LinuxArm64,MingwX64,AndroidRelease,TrixnityPlatform}PublicationToSnapshotRepository dokkaHtmlToWebsite --stacktrace diff --git a/buildSrc/src/main/kotlin/targets.kt b/buildSrc/src/main/kotlin/targets.kt index 0abb80720..5e635d4bf 100644 --- a/buildSrc/src/main/kotlin/targets.kt +++ b/buildSrc/src/main/kotlin/targets.kt @@ -68,6 +68,7 @@ fun KotlinMultiplatformExtension.addNativeTargets(configure: (KotlinNativeTarget fun KotlinMultiplatformExtension.addNativeDesktopTargets(configure: (KotlinNativeTarget.() -> Unit) = {}): Set = setOf( linuxX64(configure), + linuxArm64(configure), mingwX64(configure), ) diff --git a/trixnity-api-server/build.gradle.kts b/trixnity-api-server/build.gradle.kts index 9581daccd..a7dff1023 100644 --- a/trixnity-api-server/build.gradle.kts +++ b/trixnity-api-server/build.gradle.kts @@ -7,6 +7,7 @@ kotlin { jvmToolchain() addJvmTarget() linuxX64() + linuxArm64() sourceSets { all { diff --git a/trixnity-applicationservice/build.gradle.kts b/trixnity-applicationservice/build.gradle.kts index d2b0a6917..30ed60527 100644 --- a/trixnity-applicationservice/build.gradle.kts +++ b/trixnity-applicationservice/build.gradle.kts @@ -7,6 +7,7 @@ kotlin { jvmToolchain() addJvmTarget() linuxX64() + linuxArm64() sourceSets { all { diff --git a/trixnity-applicationserviceapi/trixnity-applicationserviceapi-server/build.gradle.kts b/trixnity-applicationserviceapi/trixnity-applicationserviceapi-server/build.gradle.kts index 76e9147a0..346575c11 100644 --- a/trixnity-applicationserviceapi/trixnity-applicationserviceapi-server/build.gradle.kts +++ b/trixnity-applicationserviceapi/trixnity-applicationserviceapi-server/build.gradle.kts @@ -7,6 +7,7 @@ kotlin { jvmToolchain() addJvmTarget() linuxX64() + linuxArm64() sourceSets { all { diff --git a/trixnity-clientserverapi/trixnity-clientserverapi-server/build.gradle.kts b/trixnity-clientserverapi/trixnity-clientserverapi-server/build.gradle.kts index fc234accb..f494a61b9 100644 --- a/trixnity-clientserverapi/trixnity-clientserverapi-server/build.gradle.kts +++ b/trixnity-clientserverapi/trixnity-clientserverapi-server/build.gradle.kts @@ -8,6 +8,7 @@ kotlin { jvmToolchain() addJvmTarget(useJUnitPlatform = false) linuxX64() + linuxArm64() sourceSets { all { diff --git a/trixnity-crypto-core/build.gradle.kts b/trixnity-crypto-core/build.gradle.kts index 10ad95515..d6a201175 100644 --- a/trixnity-crypto-core/build.gradle.kts +++ b/trixnity-crypto-core/build.gradle.kts @@ -24,6 +24,10 @@ val opensslNativeTargetList = listOf( target = KonanTarget.LINUX_X64, createTarget = { linuxX64() }, ), + OpensslNativeTarget( + target = KonanTarget.LINUX_ARM64, + createTarget = { linuxArm64() }, + ), OpensslNativeTarget( target = KonanTarget.MINGW_X64, createTarget = { mingwX64() }, @@ -84,6 +88,9 @@ kotlin { val linuxX64Main by getting { dependsOn(linuxMain) } + val linuxArm64Main by getting { + dependsOn(linuxMain) + } val mingwMain by creating { dependsOn(opensslMain) } diff --git a/trixnity-olm/build.gradle.kts b/trixnity-olm/build.gradle.kts index 48fd85139..c08b1b888 100644 --- a/trixnity-olm/build.gradle.kts +++ b/trixnity-olm/build.gradle.kts @@ -25,6 +25,10 @@ val olmNativeTargetList = listOf( target = KonanTarget.LINUX_X64, createTarget = { linuxX64() }, ), + OlmNativeTarget( + target = KonanTarget.LINUX_ARM64, + createTarget = { linuxArm64() }, + ), OlmNativeTarget( target = KonanTarget.MACOS_ARM64, createTarget = { macosArm64() }, diff --git a/trixnity-serverserverapi/trixnity-serverserverapi-server/build.gradle.kts b/trixnity-serverserverapi/trixnity-serverserverapi-server/build.gradle.kts index ddd88b07f..d3c46c45d 100644 --- a/trixnity-serverserverapi/trixnity-serverserverapi-server/build.gradle.kts +++ b/trixnity-serverserverapi/trixnity-serverserverapi-server/build.gradle.kts @@ -8,6 +8,7 @@ kotlin { jvmToolchain() addJvmTarget(useJUnitPlatform = false) linuxX64() + linuxArm64() sourceSets { all { -- GitLab