From 0e6871be72797e7a3025acfc0d9da33b10f3da63 Mon Sep 17 00:00:00 2001
From: nig <nils.ganther@tutao.de>
Date: Fri, 31 Jan 2025 14:30:10 +0100
Subject: [PATCH] wip
---
ci/merge.groovy | 39 ++-------------------------
tuta-sdk/android/sdk/build.gradle.kts | 4 +--
2 files changed, 4 insertions(+), 39 deletions(-)
diff --git a/ci/merge.groovy b/ci/merge.groovy
index 6021dae4289f..ffa9b61f5b74 100644
--- a/ci/merge.groovy
+++ b/ci/merge.groovy
@@ -31,48 +31,13 @@ pipeline {
}
stages {
- stage("git") {
- parallel {
- stage("git checkout mac") {
- when {
- expression {
- return true
- }
- }
- agent {
- label targetMac
- }
- steps {
- git(
- url: "git@github.com:tutao/tutanota.git",
- branch: params.BRANCH_NAME,
- changelog: true,
- poll: true
- )
- }
- }
-
- stage("git fetch and switch to branch") {
-
- steps {
- git(
- url: "git@github.com:tutao/tutanota.git",
- branch: params.BRANCH_NAME,
- changelog: true,
- poll: true
- )
-
- }
- }
- }
- }
stage("sync submodules") {
steps {
- sh '''
+ sh """ git switch ${params.BRANCH_NAME}
git submodule init
git submodule sync --recursive
git submodule update
- '''
+ """
script {
def successfulMasterFetch = sh(returnStatus: true, script: "git fetch origin master:master").toInteger()
if (successfulMasterFetch != 0) {
diff --git a/tuta-sdk/android/sdk/build.gradle.kts b/tuta-sdk/android/sdk/build.gradle.kts
index 09c4a9a433fe..0a83f7c22774 100644
--- a/tuta-sdk/android/sdk/build.gradle.kts
+++ b/tuta-sdk/android/sdk/build.gradle.kts
@@ -110,7 +110,7 @@ tasks.register("generateBinding") {
doLast {
exec {
this.executable("mkdir")
- this.args("-p", "${layout.buildDirectory.asFile.get()}/rustJniLibs/android/${dir}")
+ this.args("-p", "${layout.buildDirectory.asFile.get()}/jniLibs/android/${dir}")
}
exec {
this.workingDir("../../rust")
@@ -123,7 +123,7 @@ tasks.register("generateBinding") {
"uniffi-bindgen",
"generate",
"--library",
- "${layout.buildDirectory.asFile.get()}/rustJniLibs/android/${dir}/libtutasdk.so",
+ "${layout.buildDirectory.asFile.get()}/jniLibs/android/${dir}/libtutasdk.so",
"--language",
"kotlin",
"--out-dir",