diff options
author | cyBerta <cyberta@riseup.net> | 2025-03-18 00:46:31 +0100 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2025-03-18 00:05:48 +0000 |
commit | e6e3cd0dc87a31377a4d3e89d68579ea02fc2317 (patch) | |
tree | 9972c26938b447a8c433a1c3aab32e8a52c5a4d9 | |
parent | 3a418d93d09dc6eaf888ff430bd37ef152ef434a (diff) |
update references to fastlane directories
-rw-r--r-- | .gitlab-ci.yml | 4 | ||||
-rw-r--r-- | .tx/config | 8 | ||||
-rw-r--r-- | fastlane/.env.custom | 2 | ||||
-rw-r--r-- | fastlane/Fastfile | 4 | ||||
-rw-r--r-- | scripts/fetch-play-metadata.py | 4 | ||||
-rwxr-xr-x | scripts/pullTranslations.py | 8 | ||||
-rw-r--r-- | src/README.md | 4 |
7 files changed, 17 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 36988fb2..2f9508dc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,8 +93,8 @@ screenshot: - ./scripts/fastlane.sh custom artifacts: paths: - - src/custom/ - - src/normal/ + - src/customProductionFat/ + - src/normalProductionFat/ when: always expire_in: 3 days allow_failure: true @@ -22,16 +22,16 @@ resource_name = RiseupVPN Android [o:otf:p:bitmask:r:bitmask-playstore-listing] lang_map = en: en-US, es_AR: es-AR, es_CU: es-CU, fa_IR: fa-IR, kn_IN: kn-IN, pt_BR: pt-BR, pt_PT: pt-PT, zh_TW: zh-TW, nb: no -source_file = src/normal/fastlane/metadata/android/en-US/store-meta-en-US.json +source_file = src/normalProductionFat/fastlane/metadata/android/en-US/store-meta-en-US.json type = KEYVALUEJSON resource_name = Bitmask details in Appstore -file_filter = src/normal/fastlane/metadata/android/<lang>/store-meta-<lang>.json +file_filter = src/normalProductionFat/fastlane/metadata/android/<lang>/store-meta-<lang>.json minimum_perc = 98 [o:otf:p:bitmask:r:riseupvpn-playstore-listing] lang_map = en: en-US, es_AR: es-AR, es_CU: es-CU, fa_IR: fa-IR, kn_IN: kn-IN, pt_BR: pt-BR, pt_PT: pt-PT, zh_TW: zh-TW, nb: no -source_file = src/custom/fastlane/metadata/android/en-US/store-meta-en-US.json +source_file = src/customProductionFat/fastlane/metadata/android/en-US/store-meta-en-US.json type = KEYVALUEJSON resource_name = RiseupVPN details in Appstore -file_filter = src/custom/fastlane/metadata/android/<lang>/store-meta-<lang>.json +file_filter = src/customProductionFat/fastlane/metadata/android/<lang>/store-meta-<lang>.json minimum_perc = 98 diff --git a/fastlane/.env.custom b/fastlane/.env.custom index 5ec9ffd0..5b984b44 100644 --- a/fastlane/.env.custom +++ b/fastlane/.env.custom @@ -1,4 +1,4 @@ SCREENGRAB_APP_PACKAGE_NAME="se.leap.riseupvpn" SCREENGRAB_APP_APK_PATH="app/build/outputs/apk/customProductionFat/debug/RiseupVPN_debug.apk" SCREENGRAB_TESTS_APK_PATH="app/build/outputs/apk/androidTest/customProductionFat/debug/app-custom-production-fat-debug-androidTest.apk" -SCREENGRAB_OUTPUT_DIRECTORY="src/custom/fastlane/metadata/android"
\ No newline at end of file +SCREENGRAB_OUTPUT_DIRECTORY="src/customProductionFat/fastlane/metadata/android" diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 99d540ed..6e6ff88d 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -59,7 +59,7 @@ platform :android do # Prepare builds for Automatic UI Tests build_bitmask_for_screengrab capture_android_screenshots - Dir.chdir("../src/normal/fastlane/metadata") do + Dir.chdir("../src/normalProductionFat/fastlane/metadata") do frameit( white: true, path: "." @@ -72,7 +72,7 @@ platform :android do # Prepare builds for Automatic UI Tests build_custom_for_screengrab capture_android_screenshots - Dir.chdir("../src/custom/fastlane/metadata") do + Dir.chdir("../src/customProductionFat/fastlane/metadata") do frameit( white: true, path: "." diff --git a/scripts/fetch-play-metadata.py b/scripts/fetch-play-metadata.py index 309c3795..e94f4c73 100644 --- a/scripts/fetch-play-metadata.py +++ b/scripts/fetch-play-metadata.py @@ -30,9 +30,9 @@ service = build('androidpublisher', 'v3', credentials=credentials, cache_discove # Base path for Fastlane metadata def get_metadata_path(package_name): if package_name == "se.leap.bitmaskclient": - return 'src/normal/fastlane/metadata/android' + return 'src/normalProductionFat/fastlane/metadata/android' elif package_name == "se.leap.riseupvpn": - return 'src/custom/fastlane/metadata/android' + return 'src/customProductionFat/fastlane/metadata/android' else: raise ValueError(f"Unknown package name: {package_name}") diff --git a/scripts/pullTranslations.py b/scripts/pullTranslations.py index edfd5718..e688862a 100755 --- a/scripts/pullTranslations.py +++ b/scripts/pullTranslations.py @@ -46,9 +46,9 @@ def list_locales(app_type): # If there's no file, tx will skip the translations def create_metadata_files(locales, app_type): if app_type == "main": - metadata_dir = get_script_path() + "/../src/normal/fastlane/metadata/android" + metadata_dir = get_script_path() + "/../src/normalProductionFat/fastlane/metadata/android" elif app_type == "custom": - metadata_dir = get_script_path() + "/../src/custom/fastlane/metadata/android" + metadata_dir = get_script_path() + "/../src/customProductionFat/fastlane/metadata/android" else: raise ValueError("Invalid app type. Use 'main' or 'custom'.") for locale_code in locales: @@ -138,9 +138,9 @@ if __name__ == "__main__": args = parser.parse_args() if args.app_type == "main": - metadata_dir = get_script_path() + "/../src/normal/fastlane/metadata/android" + metadata_dir = get_script_path() + "/../src/normalProductionFat/fastlane/metadata/android" elif args.app_type == "custom": - metadata_dir = get_script_path() + "/../src/custom/fastlane/metadata/android" + metadata_dir = get_script_path() + "/../src/customProductionFat/fastlane/metadata/android" else: raise ValueError("Invalid app type. Use 'main' or 'custom'.") diff --git a/src/README.md b/src/README.md index 5d217ad5..8875966b 100644 --- a/src/README.md +++ b/src/README.md @@ -8,7 +8,7 @@ Any string that will be changed in the source language (en_US) in the master br # Metadata: F-Droid compatible fastlane metadata directory -The src/<flavor>/fastlande/metadata folder contains the generated metadata for f-droid builds for both Bitmask and a custom flavored client. +The src/<flavor>/fastlane/metadata folder contains the generated metadata for f-droid builds for both Bitmask and a custom flavored client. Currently neither F-Droid nor Fastlane support metadata dirs directly within build flavor dirs of a module, like `/<module>/src/<buildFlavor>/fastlane/metadata/android/` (which would be preferable). Transifex wants 1 file, play store wants 1 file, fastlane uses text files. @@ -46,7 +46,7 @@ This will fetch the existing metadata. If you updated something through your bro You can also use this when adding a new provider. You need an API token from the Google Play store. If you don't have one yet, we have some links below that should help you get started. -fastlane supply init -j <YOUR-API-DETAILS.json> -p se.leap.<PROJECTNAME> -m src/custom/fastlane/metadata/ +fastlane supply init -j <YOUR-API-DETAILS.json> -p se.leap.<PROJECTNAME> -m src/customProductionFat/fastlane/metadata/ apt install pythong3-babel |