diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 89858ffc5..a7cb2305b 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -48,6 +48,8 @@ jobs: QT_ANDROID_KEYSTORE_STORE_PASS: ${{ secrets.INPUTKEYSTORE_STOREPASS }} XC_VERSION: ${{ '16.2' }} VCPKG_ROOT: "${{ github.workspace }}/vcpkg" + LC_ALL: 'en_US.UTF-8' #fastlane + LANG: 'en_US.UTF-8' #fastlane steps: - uses: actions/checkout@v4 @@ -141,7 +143,7 @@ jobs: run: | $HOMEBREW_PREFIX/bin/openssl \ aes-256-cbc -d \ - -in mm/Input_keystore.keystore.enc \ + -in mm/scripts/ci/android/Input_keystore.keystore.enc \ -out mm/Input_keystore.keystore \ -k $INPUTKEYSTORE_DECRYPT_KEY \ -md md5 @@ -179,6 +181,26 @@ jobs: setapikey "${{ secrets.MERGIN_MAPS_BOT_GITHUB_TOKEN }}" \ -source "https://nuget.pkg.github.com/merginmaps/index.json" + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + with: + working-directory: mm/fastlane + ruby-version: '3.3' + bundler-cache: true + + - name: Decode Google Play JSON Key + run: | + $HOMEBREW_PREFIX/bin/openssl \ + aes-256-cbc -d \ + -in mm/scripts/ci/android/google_play_key.json.enc \ + -out mm/google_play_key.json \ + -k ${{ secrets.MM_GOOGLE_SERVICE_ACCOUNT_DECRYPTION_KEY }} \ + -md md5 + + MM_GOOGLE_KEY_PATH=`pwd`/mm/google_play_key.json + echo "path to keystore $MM_GOOGLE_KEY_PATH" + echo "MM_GOOGLE_KEY_PATH=$MM_GOOGLE_KEY_PATH" >> $GITHUB_ENV + - name: Calculate build number env: OFFFSET: 10 # offset for build number - due to previous builds ~ new builds must always have a higher number @@ -242,6 +264,16 @@ jobs: path: ${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk name: Mergin Maps ${{ env.MM_VERSION_CODE }} APK [${{ matrix.ANDROID_ABI }}] + - name: Deploy App to Google play - Internal app sharing + if: ${{ !(github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag') }} + run: | + cd ${{ github.workspace }}/mm/fastlane + FASTLANE_OUTPUT=$(bundle exec fastlane deploy_app_sharing mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.apk) + + echo "$FASTLANE_OUTPUT" + SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/APP_SHARE_URL:/ {print $NF}') + echo "Google play store APK link: $SHARE_URL" >> $GITHUB_STEP_SUMMARY + - name: Build AAB if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} env: @@ -266,3 +298,13 @@ jobs: with: path: ${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.aab name: Mergin Maps ${{ env.MM_VERSION_CODE }} AAB [${{ matrix.ANDROID_ABI }}] + + - name: Deploy App to Google play - Internal app sharing + if: ${{ github.ref_name == 'master' || startsWith( github.ref_name, 'dev/' ) || github.ref_type == 'tag' }} + run: | + cd ${{ github.workspace }}/mm/fastlane + FASTLANE_OUTPUT=$(bundle exec fastlane deploy_app_sharing mm_path:${{ github.workspace }}/merginmaps-${{ env.MM_VERSION_CODE }}.aab) + + echo "$FASTLANE_OUTPUT" + SHARE_URL=$(echo "$FASTLANE_OUTPUT" | awk '/APP_SHARE_URL:/ {print $NF}') + echo "Google play store AAB link: $SHARE_URL" >> $GITHUB_STEP_SUMMARY \ No newline at end of file diff --git a/.gitignore b/.gitignore index afde8b635..73b4b05af 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ app/android/build.gradle app/android/.gradle/* app/android/.gradle .github/secrets/ios/LutraConsulting*.mobileprovision +google_play_key.json +fastlane/report.xml \ No newline at end of file diff --git a/fastlane/Appfile b/fastlane/Appfile new file mode 100644 index 000000000..c037c2a13 --- /dev/null +++ b/fastlane/Appfile @@ -0,0 +1 @@ +package_name("uk.co.lutraconsulting") diff --git a/fastlane/Fastfile b/fastlane/Fastfile new file mode 100644 index 000000000..345035356 --- /dev/null +++ b/fastlane/Fastfile @@ -0,0 +1,37 @@ +# This file contains the fastlane.tools configuration +# You can find the documentation at https://docs.fastlane.tools +# +# For a list of all available actions, check out +# +# https://docs.fastlane.tools/actions +# +# For a list of all available plugins, check out +# +# https://docs.fastlane.tools/plugins/available-plugins +# + +# Uncomment the line if you want fastlane to automatically update itself +# update_fastlane + +default_platform(:android) + +platform :android do + desc "Deploy a new version to the Google Play internal app sharing" + lane :deploy_app_sharing do |options| + share_url = upload_to_play_store_internal_app_sharing( + json_key: ENV['MM_GOOGLE_KEY_PATH'], + apk: options[:mm_path] + ) + puts "APP_SHARE_URL: #{share_url}" + end + + desc "Deploy a new version to the Google Play internal beta" + lane :deploy_beta do # TODO + upload_to_play_store + end + + desc "Deploy a new version to the Google Play production" + lane :deploy_prod do # TODO + upload_to_play_store + end +end diff --git a/fastlane/Gemfile b/fastlane/Gemfile new file mode 100644 index 000000000..f21ac79ec --- /dev/null +++ b/fastlane/Gemfile @@ -0,0 +1,4 @@ +source "https://rubygems.org" + +gem "fastlane" + diff --git a/fastlane/Gemfile.lock b/fastlane/Gemfile.lock new file mode 100644 index 000000000..c1c5b6a73 --- /dev/null +++ b/fastlane/Gemfile.lock @@ -0,0 +1,229 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) + atomos (0.1.3) + aws-eventstream (1.4.0) + aws-partitions (1.1172.0) + aws-sdk-core (3.233.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + base64 + bigdecimal + jmespath (~> 1, >= 1.6.1) + logger + aws-sdk-kms (1.113.0) + aws-sdk-core (~> 3, >= 3.231.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.199.1) + aws-sdk-core (~> 3, >= 3.231.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.12.1) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + base64 (0.3.0) + bigdecimal (3.3.1) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.7.0) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.112.0) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.1) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.1.1) + multipart-post (~> 2.0) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) + faraday (~> 1.0) + fastimage (2.4.0) + fastlane (2.228.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.4.1) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.8.0) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.5.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.8) + domain_name (~> 0.5) + httpclient (2.9.0) + mutex_m + jmespath (1.6.2) + json (2.15.1) + jwt (2.10.2) + base64 + logger (1.7.0) + mini_magick (4.13.2) + mini_mime (1.1.5) + multi_json (1.17.0) + multipart-post (2.4.1) + mutex_m (0.3.0) + nanaimo (0.4.0) + naturally (2.3.0) + nkf (0.2.0) + optparse (0.6.0) + os (1.1.4) + plist (3.7.2) + public_suffix (6.0.2) + rake (13.3.0) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.4.4) + rouge (3.28.0) + ruby2_keywords (0.0.5) + rubyzip (2.4.1) + security (0.1.5) + signet (0.21.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 4.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + sysrandom (1.0.5) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unicode-display_width (2.6.0) + word_wrap (1.0.0) + xcodeproj (1.27.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.4.1) + rouge (~> 3.28.0) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + ruby + x86_64-linux + +DEPENDENCIES + fastlane + +BUNDLED WITH + 2.7.2 diff --git a/fastlane/README.md b/fastlane/README.md new file mode 100644 index 000000000..67c738cd3 --- /dev/null +++ b/fastlane/README.md @@ -0,0 +1,48 @@ +fastlane documentation +---- + +# Installation + +Make sure you have the latest version of the Xcode command line tools installed: + +```sh +xcode-select --install +``` + +For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) + +# Available Actions + +## Android + +### android deploy + +```sh +[bundle exec] fastlane android deploy +``` + +Deploy a new version to the Google Play internal app sharing + +### android deploy_beta + +```sh +[bundle exec] fastlane android deploy_beta +``` + +Deploy a new version to the Google Play internal beta + +### android deploy_prod + +```sh +[bundle exec] fastlane android deploy_prod +``` + +Deploy a new version to the Google Play production + +---- + +This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. + +More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). + +The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools). diff --git a/Input_keystore.keystore.enc b/scripts/ci/android/Input_keystore.keystore.enc similarity index 100% rename from Input_keystore.keystore.enc rename to scripts/ci/android/Input_keystore.keystore.enc diff --git a/scripts/ci/android/google_play_key.json.enc b/scripts/ci/android/google_play_key.json.enc new file mode 100644 index 000000000..6550a142e Binary files /dev/null and b/scripts/ci/android/google_play_key.json.enc differ