From 34f5c680d68467018a5b7afe41be9608dd679003 Mon Sep 17 00:00:00 2001 From: Andrey Fedorov Date: Sat, 28 Dec 2024 12:49:40 +0100 Subject: [PATCH] IOS-8885: Clean up Signed-off-by: Andrey Fedorov --- .github/workflows/build-deploy-alpha.yml | 2 +- fastlane/Fastfile | 17 ++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build-deploy-alpha.yml b/.github/workflows/build-deploy-alpha.yml index bf53057a8c..a3ea68c7a7 100644 --- a/.github/workflows/build-deploy-alpha.yml +++ b/.github/workflows/build-deploy-alpha.yml @@ -70,7 +70,7 @@ jobs: build: name: Tangem Alpha needs: prepare - uses: tangem/actions/.github/workflows/build.yml@feature/IOS-8885_private_app_config + uses: tangem/actions/.github/workflows/build.yml@feature/IOS-8885_private_app_config # TODO: Switch to main with: stage: '${{ needs.prepare.outputs.stage }}' version: '${{ needs.prepare.outputs.version }}' diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 557e7c5d34..e4ac54e7dd 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -3,7 +3,7 @@ require 'base64' default_platform(:ios) BUILD_PATH = "./fastlane/builds/" -ANALYZE_ARCHIVE_UTIL_PATH = "../private-app-config/analyze_archive.sh" +ANALYZE_ARCHIVE_UTIL_PATH = "./private-app-config/analyze_archive.sh" PRODUCTION_SCHEME = "Tangem" BETA_SCHEME = "Tangem Beta" ALPHA_SCHEME = "Tangem Alpha" @@ -149,8 +149,6 @@ lane :build_Alpha do |options| increment_version_number(version_number: options[:version]) increment_firebase_build_number(app_id: options[:firebase_app_id], build: options[:build]) - UI.important("build_Alpha_analyze_archive: #{options[:analyze_archive]}") # TODO: Remove - build( export_method: "ad-hoc", scheme: ALPHA_SCHEME, @@ -415,16 +413,7 @@ end private_lane :build do |options| clean_artifacts - if options[:analyze_archive].nil? - should_analyze_archive = false - else - # Boolean inputs from GH actions are such a mess - should_analyze_archive = (options[:analyze_archive] == true) || (options[:analyze_archive].to_s.downcase == "true") - end - - UI.important("should_analyze_archive: #{should_analyze_archive}, #{options[:analyze_archive]}") # TODO: Remove - - if should_analyze_archive + if options[:analyze_archive] == true build_and_analyze( export_method: options[:export_method], scheme: options[:scheme], @@ -465,9 +454,7 @@ private_lane :build_and_analyze do |options| xcarchive_path: xcarchive_path ) - UI.important("begin analyzing archive") sh("#{analyze_archive_util_path} '#{xcarchive_path}'") - UI.important("end analyzing archive") create_ipa( path: options[:path],