From ef434848b9c46754d17d4332b6852f69bf947a5f Mon Sep 17 00:00:00 2001
From: farfromrefug <dev@akylas.fr>
Date: Sun, 27 Oct 2024 21:01:41 +0100
Subject: [PATCH] chore: fastlane

---
 fastlane/Fastfile     | 4 ++--
 scripts/ci.prepare.sh | 9 +++++++--
 tools                 | 2 +-
 yarn.lock             | 4 ++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f8ed6f2a..164f2dc5 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -263,7 +263,7 @@ lane :build_flavor do |params|
     #   end
       when 'alpha','beta','production'
         upload_store(changelog:changelog, version: version, versionCode: versionCode, flavor:flavor, options:options, build_output:build_output)
-        if (platform == 'ios')
+        if (platform == 'ios' && options[:github] != false)
           # we now github create releases on iOS for european users
           changelog = get_changelog(platform:platform, flavor:'github')
           set_github_release(
@@ -283,7 +283,7 @@ lane :build_flavor do |params|
       end
     end
     # yarn lock might have change we dont want to commit it
-    reset_git_repo( force: true, files: ["yarn.lock"])
+    reset_git_repo( force: true, files: ["yarn.lock", "package.json"])
     # we need to pull to be able to push again
     git_pull
     # push any change
diff --git a/scripts/ci.prepare.sh b/scripts/ci.prepare.sh
index 3c518d6d..609ba89a 100644
--- a/scripts/ci.prepare.sh
+++ b/scripts/ci.prepare.sh
@@ -38,7 +38,7 @@ else
 fi
 
 
-git clone -b alpimaps https://github.com/nativescript-community/ui-carto.git
+git clone --recurse-submodules -b alpimaps https://github.com/nativescript-community/ui-carto.git
 
 if ["${PLATFORM}" -eq "android"]
 then
@@ -46,7 +46,12 @@ then
   mv carto-mobile-sdk-$CARTO_SDK_VERSION.aar ./ui-carto/packages/ui-carto/platforms/android
 else
   wget https://github.com/Akylas/mobile-sdk/releases/download/v$CARTO_SDK_VERSION/carto-mobile-sdk-ios-$CARTO_SDK_VERSION.zip
-  unzip -o-d ./ui-carto/packages/ui-carto/platforms/io carto-mobile-sdk-ios-$CARTO_SDK_VERSION.zip
+  unzip -o -d ./ui-carto/packages/ui-carto/platforms/io carto-mobile-sdk-ios-$CARTO_SDK_VERSION.zip
 fi
 
+cd ui-carto
+touch yarn.lock
+yarn
+npm run build
+cd ..git
 yarn link -r ./ui-carto/packages/ui-carto
diff --git a/tools b/tools
index b945db2b..49259a73 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit b945db2b8d1b7a412404a43f8c88ba1bee37f712
+Subproject commit 49259a73f1e68a2c402ebdea79167b682ceacd94
diff --git a/yarn.lock b/yarn.lock
index 892966d4..ddb9c56e 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -36,7 +36,7 @@ __metadata:
 
 "@akylas/nativescript-app-tools@file:tools::locator=root-workspace-0b6124%40workspace%3A.":
   version: 1.0.0
-  resolution: "@akylas/nativescript-app-tools@file:tools#tools::hash=42e9d5&locator=root-workspace-0b6124%40workspace%3A."
+  resolution: "@akylas/nativescript-app-tools@file:tools#tools::hash=e3f389&locator=root-workspace-0b6124%40workspace%3A."
   dependencies:
     "@dotenvx/dotenvx": "npm:1.19.3"
     "@nativescript-community/fontmin": "npm:0.9.11"
@@ -90,7 +90,7 @@ __metadata:
     typescript: "npm:5.6.3"
     typescript-eslint: "npm:^8.9.0"
     webpack-bundle-analyzer: "npm:^4.10.2"
-  checksum: 10/4c172a24dbc008cc67b5633feba6f6f72dd2ecc8a503e2c8963f9a373744525dee6334eda6cf56048d60394f5b65b9cbd8a12e8db75d97e09cb696fda0f3e681
+  checksum: 10/439d77603e16706b9ea41e6526940a727fb37d0668abe5385855b00f3a550f2d1c4b318c7e9ceb456e463f6cbe56b4f326b038be1fa0d91c6fdea5e7a1a6ffb4
   languageName: node
   linkType: hard