Skip to content

Commit e848d49

Browse files
authored
Fix fastlane locales with symlinks (#536)
1 parent 36c65e6 commit e848d49

File tree

9 files changed

+24
-13
lines changed

9 files changed

+24
-13
lines changed

fastlane/Fastfile

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,13 @@ platform :android do
112112
desc ""
113113
lane :capture_screens do |options|
114114
organization = organization!(options)
115+
locales = locales_or_default(options)
115116

116-
locales = if options[:locales]
117-
options[:locales].split(',')
118-
else
119-
case organization
120-
when "ooni" then ['ar', 'en-US', 'hi-IN', 'pt-BR', 'sk', 'zh-CN', 'ca', 'es-ES', 'id', 'ro', 'sq', 'zh-TW', 'de-DE', 'fa', 'is-IS', 'ru-RU', 'th', 'el-GR', 'fr-FR', 'it-IT', 'tr-TR']
121-
when "dw" then ['en-US', 'de', 'es', 'fr', 'pt-BR', 'ru', 'tr']
122-
end
123-
end
124-
125-
gradle(task: "clean copyBrandingToCommonResources assembleFullDebug assembleFullDebugAndroidTest -Porganization=#{organization}")
117+
# gradle(task: "clean copyBrandingToCommonResources assembleFullDebug assembleFullDebugAndroidTest -Porganization=#{organization}")
126118

127119
enable_demo_mode
128120
capture_android_screenshots(
129-
app_package_name: package_name(organization),
121+
app_package_name: package_name(organization, debug: true),
130122
locales: locales,
131123
output_directory: metadata_path(organization),
132124
clear_previous_screenshots: false
@@ -267,9 +259,20 @@ def metadata_path(organization)
267259
end
268260
end
269261

270-
def package_name(organization)
262+
def package_name(organization, debug: false)
271263
case organization
272264
when "ooni" then "org.openobservatory.ooniprobe"
273265
when "dw" then "com.dw.ooniprobe"
274-
end
266+
end + (debug ? '.dev' : '')
267+
end
268+
269+
def locales_or_default(options)
270+
if options[:locales]
271+
options[:locales].split(',')
272+
else
273+
case options[:organization]
274+
when "ooni" then ['ar', 'en-US', 'hi-IN', 'pt-BR', 'sk', 'zh-CN', 'ca', 'es-ES', 'id', 'ro', 'sq', 'zh-TW', 'de-DE', 'fa', 'is-IS', 'ru-RU', 'th', 'el-GR', 'fr-FR', 'it-IT', 'tr-TR']
275+
when "dw" then ['en-US', 'de', 'es', 'fr', 'pt-BR', 'ru', 'tr']
276+
end
277+
end
275278
end

fastlane/metadata/android/pt-BR

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Users/sergiosantos/Android/ooni-multiplatform/fastlane/metadata/android/pt-rBR

fastlane/metadata/android/zh-CN

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Users/sergiosantos/Android/ooni-multiplatform/fastlane/metadata/android/zh-rCN

fastlane/metadata/android/zh-TW

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Users/sergiosantos/Android/ooni-multiplatform/fastlane/metadata/android/zh-rTW

fastlane/metadata/dw/android/pt-BR

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Users/sergiosantos/Android/ooni-multiplatform/fastlane/metadata/dw/android/pt-rBR

fastlane/metadata/dw/ios/pt-BR

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Users/sergiosantos/Android/ooni-multiplatform/fastlane/metadata/dw/ios/pt-rBR

fastlane/metadata/ios/pt-BR

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Users/sergiosantos/Android/ooni-multiplatform/fastlane/metadata/ios/pt-rBR

fastlane/metadata/ios/zh-CN

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Users/sergiosantos/Android/ooni-multiplatform/fastlane/metadata/ios/zh-rCN

fastlane/metadata/ios/zh-TW

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/Users/sergiosantos/Android/ooni-multiplatform/fastlane/metadata/ios/zh-rTW

0 commit comments

Comments
 (0)