Skip to content

Commit 1d156f1

Browse files
fix(fastlane): inherit Android env vars from workflow
Use ||= to preserve env vars set by CI workflow instead of overwriting. Add NDK_HOME and JAVA_HOME to all Android lanes for Tauri CLI. Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 259234e commit 1d156f1

File tree

1 file changed

+20
-12
lines changed

1 file changed

+20
-12
lines changed

fastlane/Fastfile

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -412,9 +412,11 @@ end
412412
platform :android do
413413
desc "Build Android release (AAB and APK)"
414414
lane :build do
415-
# Set ANDROID_HOME for this session
416-
ENV['ANDROID_HOME'] = "/opt/homebrew/share/android-commandlinetools"
417-
ENV['ANDROID_NDK_HOME'] = "#{ENV['ANDROID_HOME']}/ndk/28.2.13676358"
415+
# Set Android environment for this session (inherit from env or use defaults)
416+
ENV['JAVA_HOME'] ||= "/opt/homebrew/opt/openjdk@21"
417+
ENV['ANDROID_HOME'] ||= "/opt/homebrew/share/android-commandlinetools"
418+
ENV['ANDROID_NDK_HOME'] ||= "#{ENV['ANDROID_HOME']}/ndk/28.2.13676358"
419+
ENV['NDK_HOME'] ||= ENV['ANDROID_NDK_HOME']
418420

419421
# Update tauri.conf.json with version from Cargo.toml
420422
app_version = get_app_version
@@ -438,9 +440,11 @@ platform :android do
438440

439441
desc "Build and upload to Google Play Store beta track"
440442
lane :beta do
441-
# Set ANDROID_HOME for this session
442-
ENV['ANDROID_HOME'] = "/opt/homebrew/share/android-commandlinetools"
443-
ENV['ANDROID_NDK_HOME'] = "#{ENV['ANDROID_HOME']}/ndk/28.2.13676358"
443+
# Set Android environment for this session (inherit from env or use defaults)
444+
ENV['JAVA_HOME'] ||= "/opt/homebrew/opt/openjdk@21"
445+
ENV['ANDROID_HOME'] ||= "/opt/homebrew/share/android-commandlinetools"
446+
ENV['ANDROID_NDK_HOME'] ||= "#{ENV['ANDROID_HOME']}/ndk/28.2.13676358"
447+
ENV['NDK_HOME'] ||= ENV['ANDROID_NDK_HOME']
444448

445449
# Update tauri.conf.json with version from Cargo.toml
446450
app_version = get_app_version
@@ -475,9 +479,11 @@ platform :android do
475479

476480
desc "Build and upload to Google Play Store internal testing track"
477481
lane :internal do
478-
# Set ANDROID_HOME for this session
479-
ENV['ANDROID_HOME'] = "/opt/homebrew/share/android-commandlinetools"
480-
ENV['ANDROID_NDK_HOME'] = "#{ENV['ANDROID_HOME']}/ndk/28.2.13676358"
482+
# Set Android environment for this session (inherit from env or use defaults)
483+
ENV['JAVA_HOME'] ||= "/opt/homebrew/opt/openjdk@21"
484+
ENV['ANDROID_HOME'] ||= "/opt/homebrew/share/android-commandlinetools"
485+
ENV['ANDROID_NDK_HOME'] ||= "#{ENV['ANDROID_HOME']}/ndk/28.2.13676358"
486+
ENV['NDK_HOME'] ||= ENV['ANDROID_NDK_HOME']
481487

482488
# Update tauri.conf.json with version from Cargo.toml
483489
app_version = get_app_version
@@ -512,9 +518,11 @@ platform :android do
512518

513519
desc "Upload to Google Play Store production"
514520
lane :release do
515-
# Set ANDROID_HOME for this session
516-
ENV['ANDROID_HOME'] = "/opt/homebrew/share/android-commandlinetools"
517-
ENV['ANDROID_NDK_HOME'] = "#{ENV['ANDROID_HOME']}/ndk/28.2.13676358"
521+
# Set Android environment for this session (inherit from env or use defaults)
522+
ENV['JAVA_HOME'] ||= "/opt/homebrew/opt/openjdk@21"
523+
ENV['ANDROID_HOME'] ||= "/opt/homebrew/share/android-commandlinetools"
524+
ENV['ANDROID_NDK_HOME'] ||= "#{ENV['ANDROID_HOME']}/ndk/28.2.13676358"
525+
ENV['NDK_HOME'] ||= ENV['ANDROID_NDK_HOME']
518526

519527
# Update tauri.conf.json with version from Cargo.toml
520528
app_version = get_app_version

0 commit comments

Comments
 (0)