From d803b6dc7801a2b2e68056767d6572e4924ad8e2 Mon Sep 17 00:00:00 2001 From: Adam Borbas Date: Tue, 5 Jan 2021 17:03:05 +0100 Subject: [PATCH] Use sample app api level 30 --- bitrise.yml | 240 ++++++++++++++++++++++++++-------------------------- 1 file changed, 120 insertions(+), 120 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 9557293c..2dce9ca0 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -4,37 +4,37 @@ default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git workflows: ci: steps: - - script: - inputs: - - content: stepman audit --step-yml ./step.yml - - go-list: - - golint: - - errcheck: - - go-test: + - script: + inputs: + - content: stepman audit --step-yml ./step.yml + - go-list: + - golint: + - errcheck: + - go-test: # apk deploy is before aab deploy otherwise AAB owerrides APKs when app_path input is read after_run: - - apk_deploy_test_1 - - aab_deploy_test - - multiple_aab_deploy_test + - apk_deploy_test_1 + - aab_deploy_test + - multiple_aab_deploy_test ci_untrack_phase2: after_run: - - apk_deploy_test_2 + - apk_deploy_test_2 multiple_aab_deploy_test: envs: - # sample app - - SAMPLE_APP_URL: https://github.com/bitrise-io/sample-apps-wear-os.git - - SAMPLE_APP_BRANCH: master - # codesigning - - BITRISEIO_ANDROID_KEYSTORE_URL: $BITRISEIO_ANDROID_KEYSTORE_2_URL - - BITRISEIO_ANDROID_KEYSTORE_PASSWORD: $BITRISEIO_ANDROID_KEYSTORE_2_PASSWORD - - BITRISEIO_ANDROID_KEYSTORE_ALIAS: $BITRISEIO_ANDROID_KEYSTORE_2_ALIAS - - BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD: $BITRISEIO_ANDROID_KEYSTORE_2_PRIVATE_KEY_PASSWORD - # google play deploy - - PACKAGE_NAME: "io.bitrise.android.xyztouristattractions" - - BITRISEIO_JSON_KEY_URL: $BITRISEIO_JSON_KEY_URL - - TRACK: internal + # sample app + - SAMPLE_APP_URL: https://github.com/bitrise-io/sample-apps-wear-os.git + - SAMPLE_APP_BRANCH: master + # codesigning + - BITRISEIO_ANDROID_KEYSTORE_URL: $BITRISEIO_ANDROID_KEYSTORE_2_URL + - BITRISEIO_ANDROID_KEYSTORE_PASSWORD: $BITRISEIO_ANDROID_KEYSTORE_2_PASSWORD + - BITRISEIO_ANDROID_KEYSTORE_ALIAS: $BITRISEIO_ANDROID_KEYSTORE_2_ALIAS + - BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD: $BITRISEIO_ANDROID_KEYSTORE_2_PRIVATE_KEY_PASSWORD + # google play deploy + - PACKAGE_NAME: "io.bitrise.android.xyztouristattractions" + - BITRISEIO_JSON_KEY_URL: $BITRISEIO_JSON_KEY_URL + - TRACK: internal steps: - script: inputs: @@ -58,52 +58,52 @@ workflows: - gradlew_path: ./gradlew - change-android-versioncode-and-versionname@1: inputs: - - new_version_code: $VERSION_CODE - - version_code_offset: '0' - - build_gradle_path: "$BITRISE_SOURCE_DIR/Application/build.gradle" + - new_version_code: $VERSION_CODE + - version_code_offset: "0" + - build_gradle_path: "$BITRISE_SOURCE_DIR/Application/build.gradle" - change-android-versioncode-and-versionname@1: inputs: - - new_version_code: $VERSION_CODE - - version_code_offset: '1' - - build_gradle_path: "$BITRISE_SOURCE_DIR/Wearable/build.gradle" + - new_version_code: $VERSION_CODE + - version_code_offset: "1" + - build_gradle_path: "$BITRISE_SOURCE_DIR/Wearable/build.gradle" - android-build@0: inputs: - - variant: release - - build_type: aab - - module: Application + - variant: release + - build_type: aab + - module: Application - sign-apk@1: inputs: - - android_app: "$BITRISE_AAB_PATH" + - android_app: "$BITRISE_AAB_PATH" - android-build@0: inputs: - - variant: release - - build_type: aab - - module: Wearable + - variant: release + - build_type: aab + - module: Wearable - sign-apk@1: inputs: - - android_app: "$BITRISE_AAB_PATH" + - android_app: "$BITRISE_AAB_PATH" - path::./: title: Step Test AAB inputs: - - service_account_json_key_path: $BITRISEIO_JSON_KEY_URL - - package_name: $PACKAGE_NAME - - app_path: "/bitrise/deploy/_tmp-Wearable-release-bitrise-signed.aab|/bitrise/deploy/_tmp-Application-release-bitrise-signed.aab" - - track: $TRACK + - service_account_json_key_path: $BITRISEIO_JSON_KEY_URL + - package_name: $PACKAGE_NAME + - app_path: "/bitrise/deploy/_tmp-Wearable-release-bitrise-signed.aab|/bitrise/deploy/_tmp-Application-release-bitrise-signed.aab" + - track: $TRACK aab_deploy_test: envs: - # sample app - - SAMPLE_APP_URL: https://github.com/bitrise-io/sample-apps-android-sdk22.git - - SAMPLE_APP_BRANCH: master - # codesigning - - BITRISEIO_ANDROID_KEYSTORE_URL: $BITRISEIO_ANDROID_KEYSTORE_1_URL - - BITRISEIO_ANDROID_KEYSTORE_PASSWORD: $BITRISEIO_ANDROID_KEYSTORE_PASSWORD - - BITRISEIO_ANDROID_KEYSTORE_ALIAS: $BITRISEIO_ANDROID_KEYSTORE_ALIAS - - BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD: $BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD - # google play deploy - - PACKAGE_NAME: "com.bitrise_io.sample_apps_android_simple" - - BITRISEIO_JSON_KEY_URL: $BITRISEIO_JSON_KEY_URL - - TRACK: production + # sample app + - SAMPLE_APP_URL: https://github.com/bitrise-io/sample-apps-android-sdk22.git + - SAMPLE_APP_BRANCH: master + # codesigning + - BITRISEIO_ANDROID_KEYSTORE_URL: $BITRISEIO_ANDROID_KEYSTORE_1_URL + - BITRISEIO_ANDROID_KEYSTORE_PASSWORD: $BITRISEIO_ANDROID_KEYSTORE_PASSWORD + - BITRISEIO_ANDROID_KEYSTORE_ALIAS: $BITRISEIO_ANDROID_KEYSTORE_ALIAS + - BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD: $BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD + # google play deploy + - PACKAGE_NAME: "com.bitrise_io.sample_apps_android_simple" + - BITRISEIO_JSON_KEY_URL: $BITRISEIO_JSON_KEY_URL + - TRACK: production steps: - script: inputs: @@ -136,75 +136,75 @@ workflows: - path::./: title: Step Test AAB inputs: - - service_account_json_key_path: $BITRISEIO_JSON_KEY_URL - - package_name: $PACKAGE_NAME - - app_path: $BITRISE_SIGNED_AAB_PATH - - track: $TRACK - - user_fraction: 0.6 + - service_account_json_key_path: $BITRISEIO_JSON_KEY_URL + - package_name: $PACKAGE_NAME + - app_path: $BITRISE_SIGNED_AAB_PATH + - track: $TRACK + - user_fraction: 0.6 _common_apk: envs: - # codesigning - - BITRISEIO_ANDROID_KEYSTORE_URL: $BITRISEIO_ANDROID_KEYSTORE_URL - - BITRISEIO_ANDROID_KEYSTORE_PASSWORD: $BITRISEIO_ANDROID_KEYSTORE_PASSWORD - - BITRISEIO_ANDROID_KEYSTORE_ALIAS: $BITRISEIO_ANDROID_KEYSTORE_ALIAS - - BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD: $BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD - # sample app - - SAMPLE_APP_URL: https://github.com/bitrise-io/sample-apps-android-realmtasks.git - - SAMPLE_APP_BRANCH: master - # google play deploy - - BITRISEIO_JSON_KEY_URL: $BITRISEIO_JSON_KEY_URL + # codesigning + - BITRISEIO_ANDROID_KEYSTORE_URL: $BITRISEIO_ANDROID_KEYSTORE_URL + - BITRISEIO_ANDROID_KEYSTORE_PASSWORD: $BITRISEIO_ANDROID_KEYSTORE_PASSWORD + - BITRISEIO_ANDROID_KEYSTORE_ALIAS: $BITRISEIO_ANDROID_KEYSTORE_ALIAS + - BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD: $BITRISEIO_ANDROID_KEYSTORE_PRIVATE_KEY_PASSWORD + # sample app + - SAMPLE_APP_URL: https://github.com/bitrise-io/sample-apps-android-realmtasks.git + - SAMPLE_APP_BRANCH: api_30 + # google play deploy + - BITRISEIO_JSON_KEY_URL: $BITRISEIO_JSON_KEY_URL steps: - - script: - inputs: - - content: rm -rf ./_tmp - - change-workdir: - run_if: true - inputs: - - path: ./_tmp - - script: - inputs: - - content: git clone --branch $SAMPLE_APP_BRANCH $SAMPLE_APP_URL ./ - - script: - inputs: - - content: curl -o "./app/google-services.json" "$BITRISEIO_GOOGLE_SERVICES_JSON_URL" - - install-missing-android-tools: - inputs: - - gradlew_path: ./gradlew - - change-android-versioncode-and-versionname: - inputs: - - build_gradle_path: ./app/build.gradle - - new_version_code: $BITRISE_BUILD_NUMBER - - new_version_name: "0.2.4" - - version_code_offset: 1 - - gradle-runner: - inputs: - - gradle_task: assembleRelease - - gradlew_path: ./gradlew - - sign-apk: - inputs: - - apk_path: $BITRISE_APK_PATH_LIST + - script: + inputs: + - content: rm -rf ./_tmp + - change-workdir: + run_if: true + inputs: + - path: ./_tmp + - script: + inputs: + - content: git clone --branch $SAMPLE_APP_BRANCH $SAMPLE_APP_URL ./ + - script: + inputs: + - content: curl -o "./app/google-services.json" "$BITRISEIO_GOOGLE_SERVICES_JSON_URL" + - install-missing-android-tools: + inputs: + - gradlew_path: ./gradlew + - change-android-versioncode-and-versionname: + inputs: + - build_gradle_path: ./app/build.gradle + - new_version_code: $BITRISE_BUILD_NUMBER + - new_version_name: "0.2.4" + - version_code_offset: 1 + - gradle-runner: + inputs: + - gradle_task: assembleRelease + - gradlew_path: ./gradlew + - sign-apk: + inputs: + - apk_path: $BITRISE_APK_PATH_LIST apk_deploy_test_1: envs: - # google services - - BITRISEIO_GOOGLE_SERVICES_JSON_URL: $BITRISEIO_GOOGLE_SERVICES_JSON_URL - # google play deploy - - PACKAGE_NAME: "io.bitrise.realmtasks" - - BITRISEIO_JSON_KEY_URL: $BITRISEIO_JSON_KEY_URL - - TRACK: "beta" + # google services + - BITRISEIO_GOOGLE_SERVICES_JSON_URL: $BITRISEIO_GOOGLE_SERVICES_JSON_URL + # google play deploy + - PACKAGE_NAME: "io.bitrise.realmtasks" + - BITRISEIO_JSON_KEY_URL: $BITRISEIO_JSON_KEY_URL + - TRACK: "beta" before_run: - _common_apk steps: - - path::./: - title: Step Test APK - inputs: - - service_account_json_key_path: $BITRISEIO_JSON_KEY_URL - - package_name: $PACKAGE_NAME - - app_path: $BITRISE_SIGNED_APK_PATH - - track: $TRACK - - mapping_file: "" - - user_fraction: "" + - path::./: + title: Step Test APK + inputs: + - service_account_json_key_path: $BITRISEIO_JSON_KEY_URL + - package_name: $PACKAGE_NAME + - app_path: $BITRISE_SIGNED_APK_PATH + - track: $TRACK + - mapping_file: "" + - user_fraction: "" # This is needed to test the possible shadowing of releases, it should run after apk_deploy_test_1 apk_deploy_test_2: @@ -230,11 +230,11 @@ workflows: dep-update: steps: - - script: - inputs: - - content: |- - #!/bin/bash - set -ex - go get -u -v github.com/golang/dep/cmd/dep - dep ensure -v - dep ensure -v -update + - script: + inputs: + - content: |- + #!/bin/bash + set -ex + go get -u -v github.com/golang/dep/cmd/dep + dep ensure -v + dep ensure -v -update