[ci] Make iOS Jenkins job more reliable

tutao · Dec 13, 2024 · b640755 · b640755
1 parent 20b10bc
commit b640755
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 9 deletions.
diff --git a/app-ios/mail-project.yml b/app-ios/mail-project.yml
@@ -64,8 +64,6 @@ targets:
           PRODUCT_NAME: "Tuta D"
         Release Staging:
           PRODUCT_NAME: "Tuta Test"
-          PROVISIONING_PROFILE_SPECIFIER: "match AdHoc de.tutao.tutanota.test"
-          PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]: "match AdHoc de.tutao.tutanota.test 1716556941"
         Release Production:
           PRODUCT_NAME: "Tuta Mail"
       groups:

diff --git a/buildSrc/buildWebapp.js b/buildSrc/buildWebapp.js
@@ -103,11 +103,11 @@ export async function buildWebapp({ version, stage, host, measure, minify, proje
 				webassemblyLibraries: [
 					{
 						name: "liboqs.wasm",
-						command: "make -f Makefile_liboqs build",
+						command: "make -f Makefile_liboqs testenv",
 						workingDir: "libs/webassembly/",
-						env: {
-							WASM: `../../${buildDir}/wasm/liboqs.wasm`,
-						},
+						// env: {
+						// 	WASM: `../../${buildDir}/wasm/liboqs.wasm`,
+						// },
 						optimizationLevel: "O3",
 					},
 					{

diff --git a/ci/Ios.Jenkinsfile b/ci/Ios.Jenkinsfile
@@ -161,8 +161,8 @@ def stubClientDirectory() {
 	script {
 		sh "pwd"
 		sh "echo $PATH"
-        sh "mkdir build-calendar-app"
-    	sh "mkdir build"
+        sh "mkdir -p build-calendar-app"
+    	sh "mkdir -p build"
 	}
 }
 
@@ -189,6 +189,7 @@ def generateXCodeProject(String projectPath, String spec) {
 // Runs xcodegen on all of our project specs
 def generateXCodeProjects() {
 	generateXCodeProject("app-ios", "mail-project")
+	generateXCodeProject("app-ios", "calendar-project")
 	generateXCodeProject("tuta-sdk/ios", "project")
 }
 

diff --git a/libs/webassembly/Makefile_liboqs b/libs/webassembly/Makefile_liboqs
@@ -67,4 +67,7 @@ $(WASM): include
     	--no-entry \
     	-s TOTAL_MEMORY=${TOTAL_MEMORY} \
     	-s EXPORTED_FUNCTIONS="['_OQS_KEM_new', '_OQS_KEM_free', '_OQS_KEM_keypair', '_OQS_KEM_encaps', '_OQS_KEM_decaps', '_TUTA_inject_entropy', '_malloc', '_free']" \
-    	-o $(WASM)
+    	-o $(WASM)
+
+testenv:
+	bash ./testenv.sh
diff --git a/libs/webassembly/testenv.sh b/libs/webassembly/testenv.sh
@@ -0,0 +1,3 @@
+#/bin/env bash
+
+echo "env: $MY_ENV"