From c66e3d330891396ba16873549cd7c7f16722db60 Mon Sep 17 00:00:00 2001 From: Steffen Kleinle Date: Tue, 4 Feb 2025 09:21:05 +0100 Subject: [PATCH] 566: Fix ios releases and tidy up a little --- .circleci/config.yml | 2 +- .circleci/src/jobs/build_android.yml | 2 +- android/fastlane/Fastfile | 16 +++++++--------- android/fastlane/README.md | 22 +++++++--------------- ios/fastlane/Appfile | 2 -- ios/fastlane/Deliverfile | 5 +++++ ios/fastlane/Fastfile | 6 +----- 7 files changed, 22 insertions(+), 33 deletions(-) create mode 100644 ios/fastlane/Deliverfile diff --git a/.circleci/config.yml b/.circleci/config.yml index bac2707e..7fa136ea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -234,7 +234,7 @@ jobs: directory: android - install_gradle_dependencies - run: - command: bundle exec fastlane keystore + command: bundle exec fastlane android keystore name: '[FL] Prepare Android Keystore' working_directory: android - run: diff --git a/.circleci/src/jobs/build_android.yml b/.circleci/src/jobs/build_android.yml index 3b714e82..95ad94c2 100644 --- a/.circleci/src/jobs/build_android.yml +++ b/.circleci/src/jobs/build_android.yml @@ -17,7 +17,7 @@ steps: - install_gradle_dependencies - run: name: '[FL] Prepare Android Keystore' - command: bundle exec fastlane keystore + command: bundle exec fastlane android keystore working_directory: android - run: name: '[FL] Build' diff --git a/android/fastlane/Fastfile b/android/fastlane/Fastfile index 50692879..3dc46cc1 100644 --- a/android/fastlane/Fastfile +++ b/android/fastlane/Fastfile @@ -9,8 +9,6 @@ KEYSTORE_PASSWORD = ENV["KEYSTORE_PASSWORD"] SIGNING_REPOSITORY_KEYSTORE_PATH = "signing/android/gruene-app.jks.gpg" LOCAL_KEYSTORE_PATH = "#{ENV['HOME']}/keystore.jks" -default_platform(:android) - platform :android do desc "Download and decrypt the JKS" lane :keystore do @@ -25,7 +23,9 @@ platform :android do sh("gpg --verbose --passphrase #{SIGNING_REPOSITORY_KEYSTORE_PASSWORD} --pinentry-mode loopback -o #{LOCAL_KEYSTORE_PATH} -d #{SIGNING_REPOSITORY_KEYSTORE_PATH}") end - + # The following parameters have to be passed: + # version_name: The version name the build should use + # version_code: The version code the build should use desc "Create an android release build" lane :build do |options| version_code = options[:version_code] @@ -96,13 +96,12 @@ platform :android do version_code: version_code, version_name: version_name, package_name: APPLICATION_ID, - track: production_delivery === true ? "production" : "beta", + track: production_delivery ? "production" : "beta", skip_upload_changelogs: true, skip_upload_images: true, skip_upload_screenshots: true, skip_upload_metadata: true, - # TODO change to "completed" - release_status: production_delivery === true ? "draft" : "completed", + release_status: production_delivery ? "draft" : "completed", skip_upload_apk: true, aab: "#{ENV['HOME']}/#{aab_path}", json_key_data: ENV["GOOGLE_SERVICE_ACCOUNT_JSON"] @@ -110,7 +109,7 @@ platform :android do end desc "Promote the android app from beta to production" - lane :promote do |options| + lane :promote do ensure_env_vars( env_vars: ["GOOGLE_SERVICE_ACCOUNT_JSON"] ) @@ -144,10 +143,9 @@ platform :android do skip_upload_screenshots: true, skip_upload_metadata: true, skip_upload_apk: true, - # TODO change to "completed" + skip_upload_aab: true, release_status: "draft", json_key_data: ENV["GOOGLE_SERVICE_ACCOUNT_JSON"] ) end - end diff --git a/android/fastlane/README.md b/android/fastlane/README.md index 03edd0d0..db67543e 100644 --- a/android/fastlane/README.md +++ b/android/fastlane/README.md @@ -23,37 +23,29 @@ For _fastlane_ installation instructions, see [Installing _fastlane_](https://do Download and decrypt the JKS -### android validate_play_store_key - -```sh -[bundle exec] fastlane android validate_play_store_key -``` - -Validate Play Store Key - ### android build ```sh [bundle exec] fastlane android build ``` -Build Android App +Create an android release build -### android upload_to_playstore +### android upload ```sh -[bundle exec] fastlane android upload_to_playstore +[bundle exec] fastlane android upload ``` -Upload Android App to Google Play +Deliver android app to beta or production -### android playstore_promote +### android promote ```sh -[bundle exec] fastlane android playstore_promote +[bundle exec] fastlane android promote ``` -Promote the most recent version in the beta track to the production track in the Play Store. +Promote the android app from beta to production ---- diff --git a/ios/fastlane/Appfile b/ios/fastlane/Appfile index 041fb0c5..d756144d 100644 --- a/ios/fastlane/Appfile +++ b/ios/fastlane/Appfile @@ -1,5 +1,3 @@ -# More information: https://docs.fastlane.tools/advanced/#appfile - apple_id "app@verdigado.com" team_id "BH3ML3K6G2" app_identifier "de.gruene.wkapp" diff --git a/ios/fastlane/Deliverfile b/ios/fastlane/Deliverfile new file mode 100644 index 00000000..c57722df --- /dev/null +++ b/ios/fastlane/Deliverfile @@ -0,0 +1,5 @@ +languages(['de-DE']) + +release_notes({ + 'default' => "Wir haben die App für Dich verbessert" +}) diff --git a/ios/fastlane/Fastfile b/ios/fastlane/Fastfile index eacbdd6d..28b82561 100644 --- a/ios/fastlane/Fastfile +++ b/ios/fastlane/Fastfile @@ -4,10 +4,8 @@ before_all do setup_circle_ci end -default_platform(:ios) - platform :ios do - private_lane :apple_auth do |options| + private_lane :apple_auth do ensure_env_vars( env_vars: ["APP_STORE_CONNECT_API_KEY_ID", "APP_STORE_CONNECT_API_ISSUER_ID", "APP_STORE_CONNECT_API_KEY_CONTENT"] ) @@ -102,7 +100,6 @@ platform :ios do ipa: "#{ENV['HOME']}/#{ipa_path}", app_version: version_name, submit_for_review: true, - # TODO change to true automatic_release: false, force: true, skip_screenshots: true, @@ -134,7 +131,6 @@ platform :ios do build_number: testflight_build_number.to_s, app_identifier: BUNDLE_IDENTIFIER, submit_for_review: true, - # TODO change to true automatic_release: false, force: true, skip_metadata: false,