From 7ffbd1a8f7ba573f28a85661e4fa6e469b2359b6 Mon Sep 17 00:00:00 2001 From: Marcos Rodriguez Velez Date: Mon, 11 Nov 2024 18:40:29 -0400 Subject: [PATCH 1/3] OPS: Special characters broke file path --- .github/workflows/build-release-apk.yml | 2 +- fastlane/Fastfile | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-release-apk.yml b/.github/workflows/build-release-apk.yml index 0936fc07f..09a54fbf9 100644 --- a/.github/workflows/build-release-apk.yml +++ b/.github/workflows/build-release-apk.yml @@ -80,7 +80,7 @@ jobs: run: | VERSION_NAME=$(grep versionName android/app/build.gradle | awk '{print $2}' | tr -d '"') BRANCH_NAME=${GITHUB_HEAD_REF:-${GITHUB_REF_NAME}} - BRANCH_NAME=$(echo "$BRANCH_NAME" | sed 's/[^a-zA-Z0-9_-]/-/g') + BRANCH_NAME=$(echo "$BRANCH_NAME" | sed 's/[^a-zA-Z0-9_-]/_/g') if [ -n "$BRANCH_NAME" ] && [ "$BRANCH_NAME" != "master" ]; then EXPECTED_FILENAME="BlueWallet-${VERSION_NAME}-${NEW_BUILD_NUMBER}-${BRANCH_NAME}.apk" diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 1bbe43cbd..ed0214e5a 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -64,9 +64,10 @@ platform :android do sh("cd android && ./gradlew assembleRelease") UI.message("APK build completed.") - # Define paths - unsigned_apk_path = "android/app/build/outputs/apk/release/app-release-unsigned.apk" - signed_apk_path = "android/app/build/outputs/apk/release/#{signed_apk_name}" + # Define APK name based on branch + signed_apk_name = branch_name != 'master' ? + "BlueWallet-#{version_name}-#{build_number}-#{branch_name}".gsub(/[\/\\:?*"<>|]/, '_') + ".apk" : + "BlueWallet-#{version_name}-#{build_number}.apk" # Rename APK if File.exist?(unsigned_apk_path) From dfafbc487514e672607a7957abfafc6a21c7a2e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Rodriguez=20V=C3=A9lez?= Date: Tue, 12 Nov 2024 12:57:45 -0400 Subject: [PATCH 2/3] Update Fastfile --- fastlane/Fastfile | 1 + 1 file changed, 1 insertion(+) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index ed0214e5a..ea4b875a2 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -65,6 +65,7 @@ platform :android do UI.message("APK build completed.") # Define APK name based on branch + unsigned_apk_path = "android/app/build/outputs/apk/release/app-release-unsigned.apk" signed_apk_name = branch_name != 'master' ? "BlueWallet-#{version_name}-#{build_number}-#{branch_name}".gsub(/[\/\\:?*"<>|]/, '_') + ".apk" : "BlueWallet-#{version_name}-#{build_number}.apk" From 3b818442d15b781d5b0147c28f0315093dac32c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Rodriguez=20V=C3=A9lez?= Date: Tue, 12 Nov 2024 13:32:46 -0400 Subject: [PATCH 3/3] Update Fastfile --- fastlane/Fastfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index ea4b875a2..9a8424e67 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -65,11 +65,13 @@ platform :android do UI.message("APK build completed.") # Define APK name based on branch - unsigned_apk_path = "android/app/build/outputs/apk/release/app-release-unsigned.apk" signed_apk_name = branch_name != 'master' ? "BlueWallet-#{version_name}-#{build_number}-#{branch_name}".gsub(/[\/\\:?*"<>|]/, '_') + ".apk" : "BlueWallet-#{version_name}-#{build_number}.apk" + # Define paths + unsigned_apk_path = "android/app/build/outputs/apk/release/app-release-unsigned.apk" + signed_apk_path = "android/app/build/outputs/apk/release/#{signed_apk_name}" # Rename APK if File.exist?(unsigned_apk_path) UI.message("Renaming APK to #{signed_apk_name}...")