From c6a99c84bb0d99a62128ad5c79af94a58a8062da Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Tue, 24 Sep 2024 14:11:24 +0100 Subject: [PATCH 01/36] Modular yaml test --- bitrise.yml | 2 ++ included.yml | 12 ++++++++++++ 2 files changed, 14 insertions(+) create mode 100644 included.yml diff --git a/bitrise.yml b/bitrise.yml index 1e5ae42..fafd2a4 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -2,6 +2,8 @@ format_version: '8' default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git project_type: ios +include: + - path: included.yml trigger_map: - push_branch: "*" workflow: primary diff --git a/included.yml b/included.yml new file mode 100644 index 0000000..9f35f07 --- /dev/null +++ b/included.yml @@ -0,0 +1,12 @@ +format_version: 10 + +app: + envs: + - USERNAME: UserName + +workflows: + test: + steps: + - script: + inputs: + - content: echo "Hello ${USERNAME}!" From 53a14784d179cf80230608568cc53b9c862d8eaa Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Wed, 27 Nov 2024 13:29:45 +0000 Subject: [PATCH 02/36] Using remote repository --- bitrise.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bitrise.yml b/bitrise.yml index fafd2a4..10f9491 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -4,6 +4,8 @@ default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git project_type: ios include: - path: included.yml + - branch: include + - repository: git@github.com:atanas-bitrise/Bitrise-iOS-Sample.git trigger_map: - push_branch: "*" workflow: primary From 6e83a84b909aa6d3eadc2c8c692e7d05daf4adbb Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Wed, 27 Nov 2024 13:31:33 +0000 Subject: [PATCH 03/36] Changed repository to https --- bitrise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitrise.yml b/bitrise.yml index 10f9491..15bef96 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -5,7 +5,7 @@ project_type: ios include: - path: included.yml - branch: include - - repository: git@github.com:atanas-bitrise/Bitrise-iOS-Sample.git + - repository: https://github.com/atanas-bitrise/Bitrise-iOS-Sample.git trigger_map: - push_branch: "*" workflow: primary From 844dd188b439ec3dd505b43d0a2fccdc85cc22a8 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Wed, 27 Nov 2024 13:37:05 +0000 Subject: [PATCH 04/36] Indentation fix --- bitrise.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 15bef96..3681fbc 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -3,9 +3,9 @@ format_version: '8' default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git project_type: ios include: - - path: included.yml - - branch: include - - repository: https://github.com/atanas-bitrise/Bitrise-iOS-Sample.git +- path: included.yml + branch: include + repository: https://github.com/atanas-bitrise/Bitrise-iOS-Sample.git trigger_map: - push_branch: "*" workflow: primary From 7111ca9693d64babc23d1fb1da3c543d1cff6fce Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Wed, 27 Nov 2024 13:39:26 +0000 Subject: [PATCH 05/36] More indentations --- bitrise.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bitrise.yml b/bitrise.yml index 3681fbc..f6ec346 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -3,9 +3,9 @@ format_version: '8' default_step_lib_source: https://github.com/bitrise-io/bitrise-steplib.git project_type: ios include: -- path: included.yml - branch: include - repository: https://github.com/atanas-bitrise/Bitrise-iOS-Sample.git + - path: included.yml + branch: include + repository: https://github.com/atanas-bitrise/Bitrise-iOS-Sample.git trigger_map: - push_branch: "*" workflow: primary From fe52acbb427bcd9e684781b80a57c401a2dee5b4 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Wed, 27 Nov 2024 13:47:16 +0000 Subject: [PATCH 06/36] Repo name --- bitrise.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitrise.yml b/bitrise.yml index f6ec346..6227ae4 100644 --- a/bitrise.yml +++ b/bitrise.yml @@ -5,7 +5,7 @@ project_type: ios include: - path: included.yml branch: include - repository: https://github.com/atanas-bitrise/Bitrise-iOS-Sample.git + repository: Bitrise-iOS-Sample trigger_map: - push_branch: "*" workflow: primary From d37a8646f8716b22e1bc56ae6bf8b54660d8e3a6 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 14:37:06 +0000 Subject: [PATCH 07/36] Added a second included file --- included2.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 included2.yml diff --git a/included2.yml b/included2.yml new file mode 100644 index 0000000..c502bd2 --- /dev/null +++ b/included2.yml @@ -0,0 +1,12 @@ +format_version: 10 + +app: + envs: + - PASSWORD: NotSoSafe + +workflows: + test2: + steps: + - script: + inputs: + - content: echo "Your password ${PASSWORD} is not secure!" From 28d0f6142919c1bc8a129b55d848332cad263c07 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 14:41:54 +0000 Subject: [PATCH 08/36] Removed metadata, only left workflow --- included2.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/included2.yml b/included2.yml index c502bd2..4dce897 100644 --- a/included2.yml +++ b/included2.yml @@ -1,10 +1,3 @@ -format_version: 10 - -app: - envs: - - PASSWORD: NotSoSafe - -workflows: test2: steps: - script: From 7d811aff2747126fed1cce7fe5a7fa55ed1aebc3 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 14:54:12 +0000 Subject: [PATCH 09/36] Updated includes --- included.yml | 2 +- included2.yml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/included.yml b/included.yml index 9f35f07..2f8852b 100644 --- a/included.yml +++ b/included.yml @@ -1,4 +1,4 @@ -format_version: 10 +format_version: 13 app: envs: diff --git a/included2.yml b/included2.yml index 4dce897..76d3421 100644 --- a/included2.yml +++ b/included2.yml @@ -1,5 +1,8 @@ +format_version: 13 + +workflows: test2: steps: - script: inputs: - - content: echo "Your password ${PASSWORD} is not secure!" + - content: echo "Hello ${USERNAME}!" From 2b141482737f9a58f9e4ef5297cd3a4d2bf05b8f Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 15:00:11 +0000 Subject: [PATCH 10/36] Edited included workflow --- included2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/included2.yml b/included2.yml index 76d3421..8f8048b 100644 --- a/included2.yml +++ b/included2.yml @@ -5,4 +5,4 @@ workflows: steps: - script: inputs: - - content: echo "Hello ${USERNAME}!" + - content: echo "Hello world!" From 692c80e9e3ceab8ae2c5d8b9e759f4b422d4ae54 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 17:54:25 +0000 Subject: [PATCH 11/36] Something production release something else From 342f79864d2abdb21d91c3b20f401eee1f701c40 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 17:54:52 +0000 Subject: [PATCH 12/36] Something production release something else From 4c413f7659d20e197b12b3da35ac52efbaf90563 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 17:55:22 +0000 Subject: [PATCH 13/36] Something production release something else 1 From e882e616d827d430ee66142cbae8d0fcdda0e7d4 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 17:57:03 +0000 Subject: [PATCH 14/36] Something production release something else 2 From 2dc23a7399bea2a46b0294724ea42baaed4cf367 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 17:59:04 +0000 Subject: [PATCH 15/36] Something production release something else 3 From 0caf515c321f91c2477e32713e2d48e57d26b94a Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 18:00:42 +0000 Subject: [PATCH 16/36] Something production release something else 4 From f9c87d5e3d3f69ed81346323a5afde7b71515c75 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 18:01:26 +0000 Subject: [PATCH 17/36] Something production release something else 5 From a9c7d7711e1389f585d36d9a1cd7a1e4bcc275cf Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 18:01:44 +0000 Subject: [PATCH 18/36] Something production release something else 6 From 6fe2f59c3faa38de38b72c459e1441d7dddff250 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 18:02:31 +0000 Subject: [PATCH 19/36] Something production release something else 7 From e6b55c867f6d965fc1521c76eb918103ab9db242 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 3 Jan 2025 18:03:11 +0000 Subject: [PATCH 20/36] Something production release something else 8 From 53f62f410317ee58b47f09dab2e96cf846990c96 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 6 Jan 2025 11:28:30 +0000 Subject: [PATCH 21/36] Try to break merge --- included.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/included.yml b/included.yml index 2f8852b..8f4c3e7 100644 --- a/included.yml +++ b/included.yml @@ -1,4 +1,4 @@ -format_version: 13 +format_version: 7 app: envs: From 79df49c2c01c21238695e98d3b5c9c97c3c77752 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 6 Jan 2025 11:30:00 +0000 Subject: [PATCH 22/36] Broken --- included.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/included.yml b/included.yml index 8f4c3e7..a1c8ab8 100644 --- a/included.yml +++ b/included.yml @@ -1,10 +1,9 @@ -format_version: 7 +format_version: 14 app: envs: - USERNAME: UserName -workflows: test: steps: - script: From 040f135a159145c4e75a7b87ba4d6a72bf10bc20 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 6 Jan 2025 11:32:38 +0000 Subject: [PATCH 23/36] Fix syntax --- included.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/included.yml b/included.yml index a1c8ab8..7a2f79c 100644 --- a/included.yml +++ b/included.yml @@ -4,6 +4,7 @@ app: envs: - USERNAME: UserName +workflows: test: steps: - script: From 54a50c29e1e61283a028fb5fb3265c4acd350559 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 13 Jan 2025 15:18:54 +0000 Subject: [PATCH 24/36] Merge conflict --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 09e8a1d..2e6905a 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,8 @@ Simple iOS Project with working bitrise.yml included in the root of the project ## Bitrise Setup +Something else in here for the merge conflict. + Create a new project in Bitrise using this repo as you normally would. Use the `bitrise.yml` from the repo to define your workflows. In order to sign the app during the `deploy` workflow archive step, you must set a valid provisioning profile and signing certificate in the `bitrise.yml` (`BITRISE_PROFILE_ID` and `BITRISE_CODE_SIGNING_IDENTITY` env vars) and upload those to your account. More details can be found in the [internal wiki](https://bitrise.atlassian.net/wiki/spaces/~833061986/pages/1554875463/Demo+App-Bitrise+Deploy+Workflow). From 2acae61046b0e968f29f6ad2c60a6db3a4961664 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 31 Jan 2025 13:49:14 +0000 Subject: [PATCH 25/36] Added circular dependency --- included.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/included.yml b/included.yml index 7a2f79c..2e7b6ec 100644 --- a/included.yml +++ b/included.yml @@ -3,7 +3,10 @@ format_version: 14 app: envs: - USERNAME: UserName - +include: + - path: included.yml + branch: include + repository: https://github.com/atanas-bitrise/bitrise-checks workflows: test: steps: From 09e8fcac7f588f4b251caef62be66ff01e76c67a Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Fri, 31 Jan 2025 13:50:52 +0000 Subject: [PATCH 26/36] Removed circular dependency --- included.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/included.yml b/included.yml index 2e7b6ec..7a2f79c 100644 --- a/included.yml +++ b/included.yml @@ -3,10 +3,7 @@ format_version: 14 app: envs: - USERNAME: UserName -include: - - path: included.yml - branch: include - repository: https://github.com/atanas-bitrise/bitrise-checks + workflows: test: steps: From 353004aaacfceac71cf281d03cd54aa85b7eac53 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 30 Jun 2025 18:30:54 +0100 Subject: [PATCH 27/36] Deploy android --- included2.yml | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/included2.yml b/included2.yml index 8f8048b..e4b9167 100644 --- a/included2.yml +++ b/included2.yml @@ -6,3 +6,114 @@ workflows: - script: inputs: - content: echo "Hello world!" + deploy_android: + meta: + bitrise.io: + machine_type_id: g2.mac.x-large + stack: osx-xcode-16.2.x + steps: + - bundle::authenticate_and_clone: {} + - bundle::clone_ci_scripts_repository: {} + - set-java-version@1: + inputs: + - set_java_version: '17' + - bundle::restore_install_save_node_cache_mac: + - bundle::restore_install_save_yarn_cache: {} + - script@1: + inputs: + - content: | + #!/usr/bin/env bash + set -exo pipefail + yarn useProductionEnv + source $WORKDIR/../mobile-ci/bitrise/android/scripts/setup-project.sh --run-expo-prebuild + title: Setup mobile project + - bundle::restore_install_save_ruby_cache: {} + - script@1: + inputs: + - content: |- + #!/usr/bin/env bash + set -exo pipefail + + echo $GOOGLE_PLAYSTORE_SERVICE_JSON + echo $GOOGLE_PLAYSTORE_SERVICE_JSON >> mobile-team.json + echo $GOOGLE_PLAYSTORE_SERVICE_JSON >> ./fastlane/mobile-team.json + cat mobile-team.json + title: Extract Playstore API JSON file + - script@1: + inputs: + - content: |- + #!/usr/bin/env bash + set -exo pipefail + + echo "$VERSION && $VERSIONCODE && $JSVERSION" + # update version versionCode and jsVersion in app.json + jq '.expo.version = "'$VERSION'"' app.json > app2.json && mv app2.json app.json + jq '.expo.runtimeVersion = "'$VERSION'"' app.json > app2.json && mv app2.json app.json + jq '.expo.versionCode = '$VERSIONCODE'' app.json > app2.json && mv app2.json app.json + jq '.expo.jsVersion = '$JSVERSION'' app.json > app2.json && mv app2.json app.json + cat app.json + title: Increment app version + - restore-cache@2: + inputs: + - key: '{{ .OS }}-{{ .Arch }}-gradle-cache-{{ checksum "**/*.gradle*" "**/gradle-wrapper.properties" + "**/gradle.properties" "**/gradle/libs.versions.toml" }}' + title: Restore gradle cache + - restore-cache@2: + inputs: + - key: daily-metro-cache-mac-android + - verbose: 'true' + title: Restore Metro JS cache for android + - bundle::generate_aws_codeartifact_token: {} + - script@1: + inputs: + - content: |- + #!/usr/bin/env bash + set -exo pipefail + + export ENVFILE=.env.production + export ENV_NAME="production" + export SENTRY_DISABLE_AUTO_UPLOAD=false + gem install bundler:2.4.10 + bundle _2.4.10_ install + bundle _2.4.10_ exec fastlane android build_release_bundle + title: Build Android App + - save-gradle-cache@1: {} + - script@1: + inputs: + - content: |- + #!/usr/bin/env bash + set -exo pipefail + bundle _2.4.10_ exec fastlane android release_playstore + run_if: '{{or (enveq "DEBUG_RUN" "false") (enveq "DEBUG_RUN" "")}}' + title: Release Android App + - script@1: + inputs: + - content: |- + #!/usr/bin/env bash + set -ex + + envman add --key RELEASE_ANDROID_STATUS --value $BITRISE_BUILD_STATUS + echo "envman add --key RELEASE_ANDROID_STATUS --value $BITRISE_BUILD_STATUS" >> deploy_android_env.txt + is_always_run: true + title: Set Release Android status + - bundle::sentry_sourcemap_upload_android: {} + - share-pipeline-variable@1: + inputs: + - variables: RELEASE_ANDROID_STATUS + is_always_run: true + - deploy-to-bitrise-io@2: + inputs: + - pipeline_intermediate_files: "$WORKDIR/deploy_android_env.txt:DEPLOY_ANDROID_ENV" + - debug_mode: 'true' + - notify_user_groups: none + - zip_name: '' + is_always_run: true + is_skippable: true + - deploy-to-bitrise-io@2: + inputs: + - pipeline_intermediate_files: "$ANDROID_RELEASE_AAB_PATH:ANDROID_BUILD" + - debug_mode: 'true' + - notify_user_groups: none + - zip_name: '' + is_always_run: true + is_skippable: true From 12fd229849e4e19c7ba33ecde24b0bdf438c9ab5 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 30 Jun 2025 18:37:32 +0100 Subject: [PATCH 28/36] Added missing step bundle --- included2.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/included2.yml b/included2.yml index e4b9167..17a22c6 100644 --- a/included2.yml +++ b/included2.yml @@ -1,5 +1,15 @@ format_version: 13 - +step_bundles: + authenticate_and_clone: + steps: + - authenticate-host-with-netrc@0: + inputs: + - host: github.com + - username: username + - password: "$GIT_HTTP_PASSWORD" + - git-clone@6: + inputs: + - clone_depth: '1' workflows: test2: steps: From 64907ca6b173848953eb2893fd55030ee92345cf Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 30 Jun 2025 18:39:13 +0100 Subject: [PATCH 29/36] Added another step bundle --- included2.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/included2.yml b/included2.yml index 17a22c6..29a7964 100644 --- a/included2.yml +++ b/included2.yml @@ -10,6 +10,22 @@ step_bundles: - git-clone@6: inputs: - clone_depth: '1' + clone_ci_scripts_repository: + envs: + - MOBILE_CI_REPO: mobile-ci + - MOBILE_CI_SCRIPTS_BRANCH: master + steps: + - script@1: + inputs: + - content: |- + #!/usr/bin/env bash + set -exo pipefail + + git clone https://github.com/$MOBILE_CI_REPO.git $WORKDIR/../mobile-ci + cd $WORKDIR/../mobile-ci + git checkout $MOBILE_CI_SCRIPTS_BRANCH + git pull origin $MOBILE_CI_SCRIPTS_BRANCH + title: Clone mobile-ci repo workflows: test2: steps: From be2f81841e1c76ba15e341c678934a3194286266 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 30 Jun 2025 18:41:00 +0100 Subject: [PATCH 30/36] Added missing bundle --- included2.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/included2.yml b/included2.yml index 29a7964..ba25cdd 100644 --- a/included2.yml +++ b/included2.yml @@ -26,6 +26,34 @@ step_bundles: git checkout $MOBILE_CI_SCRIPTS_BRANCH git pull origin $MOBILE_CI_SCRIPTS_BRANCH title: Clone mobile-ci repo + restore_install_save_node_cache_mac: + steps: + - restore-cache@2: + inputs: + - key: asdf-node-mac-m1 + title: Restore asdf node cache + - script@1: + inputs: + - content: |- + #!/usr/bin/env bash + set -exo pipefail + + echo "legacy_version_file = yes" >> /Users/vagrant/.asdfrc + cat /Users/vagrant/.asdfrc + NODE_VERSION=$(cat .nvmrc | sed 's/^v//') + asdf install nodejs $NODE_VERSION + asdf global nodejs $NODE_VERSION + asdf reshim + npm install --global yarn@1.18.0 + title: Install node versions using asdf + - save-cache@1: + inputs: + - paths: "/Users/vagrant/.asdf/installs/nodejs/" + - verbose: 'true' + - is_key_unique: 'true' + - key: asdf-node-mac-m1 + run_if: '{{enveq "IS_DEVELOP_HEALTH_CHECK_JOB" "true"}}' + title: Save asdf node cache workflows: test2: steps: From 9ba2291dda818a43927b716533fc42add514df42 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 30 Jun 2025 18:42:01 +0100 Subject: [PATCH 31/36] Missing bundle --- included2.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/included2.yml b/included2.yml index ba25cdd..c47d606 100644 --- a/included2.yml +++ b/included2.yml @@ -54,6 +54,17 @@ step_bundles: - key: asdf-node-mac-m1 run_if: '{{enveq "IS_DEVELOP_HEALTH_CHECK_JOB" "true"}}' title: Save asdf node cache + restore_install_save_yarn_cache: + steps: + - restore-cache@2: + inputs: + - key: '{{ .OS }}-{{ .Arch }}-npm-cache-{{ checksum "yarn.lock"}}' + title: Restore yarn cache + - yarn@0: + inputs: + - cache_local_deps: 'yes' + - save-npm-cache@1: + run_if: '{{enveq "IS_DEVELOP_HEALTH_CHECK_JOB" "true"}}' workflows: test2: steps: From 789e963942f1d82018c3317434eb02fbb301cce0 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 30 Jun 2025 18:43:03 +0100 Subject: [PATCH 32/36] Bundle --- included2.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/included2.yml b/included2.yml index c47d606..874bd11 100644 --- a/included2.yml +++ b/included2.yml @@ -65,6 +65,28 @@ step_bundles: - cache_local_deps: 'yes' - save-npm-cache@1: run_if: '{{enveq "IS_DEVELOP_HEALTH_CHECK_JOB" "true"}}' + restore_install_save_ruby_cache: + steps: + - restore-cache@2: + inputs: + - key: asdf-ruby-mac-m1 + title: Restore asdf ruby cache + - script@1: + inputs: + - content: |- + #!/usr/bin/env bash + + asdf install ruby 3.3.0 + asdf global ruby 3.3.0 + asdf reshim + title: Install ruby using asdf + - save-cache@1: + inputs: + - paths: "/Users/vagrant/.asdf/installs/ruby/" + - is_key_unique: 'true' + - key: asdf-ruby-mac-m1 + run_if: '{{enveq "IS_DEVELOP_HEALTH_CHECK_JOB" "true"}}' + title: Save asdf ruby cache workflows: test2: steps: From 7f4dab91ff517f1a69664a15c1da0daafeb53d1e Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 30 Jun 2025 18:44:19 +0100 Subject: [PATCH 33/36] Bundle --- included2.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/included2.yml b/included2.yml index 874bd11..4fcc2aa 100644 --- a/included2.yml +++ b/included2.yml @@ -87,6 +87,21 @@ step_bundles: - key: asdf-ruby-mac-m1 run_if: '{{enveq "IS_DEVELOP_HEALTH_CHECK_JOB" "true"}}' title: Save asdf ruby cache + generate_aws_codeartifact_token: + envs: + - AWS_DOMAIN: ci + - AWS_DOMAIN_OWNER: 123456789 + - AWS_REGION: us-west-12 + steps: + - script@1: + inputs: + - content: |- + #!/usr/bin/env bash + set -exo pipefail + + CODEARTIFACT_AUTH_TOKEN=$(aws codeartifact get-authorization-token --domain $AWS_DOMAIN --domain-owner $AWS_DOMAIN_OWNER --region $AWS_REGION --query authorizationToken --output text) + envman add --key CODEARTIFACT_AUTH_TOKEN --value $CODEARTIFACT_AUTH_TOKEN + title: Generate Code Artifact Token workflows: test2: steps: From ebe3c9a815466248bef18648c213ca3733384e80 Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 30 Jun 2025 18:45:16 +0100 Subject: [PATCH 34/36] Empty bundle --- included2.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/included2.yml b/included2.yml index 4fcc2aa..549f216 100644 --- a/included2.yml +++ b/included2.yml @@ -102,6 +102,8 @@ step_bundles: CODEARTIFACT_AUTH_TOKEN=$(aws codeartifact get-authorization-token --domain $AWS_DOMAIN --domain-owner $AWS_DOMAIN_OWNER --region $AWS_REGION --query authorizationToken --output text) envman add --key CODEARTIFACT_AUTH_TOKEN --value $CODEARTIFACT_AUTH_TOKEN title: Generate Code Artifact Token + sentry_sourcemap_upload_android: + steps: workflows: test2: steps: From 9feebf1ca14d85fb853f320951142fda9c658beb Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 30 Jun 2025 18:53:01 +0100 Subject: [PATCH 35/36] Changed workflow --- included2.yml | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/included2.yml b/included2.yml index 549f216..226e831 100644 --- a/included2.yml +++ b/included2.yml @@ -120,9 +120,24 @@ workflows: - bundle::clone_ci_scripts_repository: {} - set-java-version@1: inputs: - - set_java_version: '17' - - bundle::restore_install_save_node_cache_mac: + - set_java_version: "17" + - bundle::restore_install_save_node_cache_mac: null - bundle::restore_install_save_yarn_cache: {} + - script@1: + inputs: + - content: |- + #!/usr/bin/env bash + set -exo pipefail + + # Get the current version from app.json + echo "$VERSION && $VERSIONCODE && $JSVERSION" + # update version versionCode and jsVersion in app.json + jq '.expo.version = "'$VERSION'"' app.json > app2.json && mv app2.json app.json + jq '.expo.runtimeVersion = "'$VERSION'"' app.json > app2.json && mv app2.json app.json + jq '.expo.versionCode = '$VERSIONCODE'' app.json > app2.json && mv app2.json app.json + jq '.expo.jsVersion = '$JSVERSION'' app.json > app2.json && mv app2.json app.json + cat app.json + title: Increment app version - script@1: inputs: - content: | @@ -143,20 +158,6 @@ workflows: echo $GOOGLE_PLAYSTORE_SERVICE_JSON >> ./fastlane/mobile-team.json cat mobile-team.json title: Extract Playstore API JSON file - - script@1: - inputs: - - content: |- - #!/usr/bin/env bash - set -exo pipefail - - echo "$VERSION && $VERSIONCODE && $JSVERSION" - # update version versionCode and jsVersion in app.json - jq '.expo.version = "'$VERSION'"' app.json > app2.json && mv app2.json app.json - jq '.expo.runtimeVersion = "'$VERSION'"' app.json > app2.json && mv app2.json app.json - jq '.expo.versionCode = '$VERSIONCODE'' app.json > app2.json && mv app2.json app.json - jq '.expo.jsVersion = '$JSVERSION'' app.json > app2.json && mv app2.json app.json - cat app.json - title: Increment app version - restore-cache@2: inputs: - key: '{{ .OS }}-{{ .Arch }}-gradle-cache-{{ checksum "**/*.gradle*" "**/gradle-wrapper.properties" @@ -165,7 +166,7 @@ workflows: - restore-cache@2: inputs: - key: daily-metro-cache-mac-android - - verbose: 'true' + - verbose: "true" title: Restore Metro JS cache for android - bundle::generate_aws_codeartifact_token: {} - script@1: @@ -207,17 +208,17 @@ workflows: is_always_run: true - deploy-to-bitrise-io@2: inputs: - - pipeline_intermediate_files: "$WORKDIR/deploy_android_env.txt:DEPLOY_ANDROID_ENV" - - debug_mode: 'true' + - pipeline_intermediate_files: $WORKDIR/deploy_android_env.txt:DEPLOY_ANDROID_ENV + - debug_mode: "true" - notify_user_groups: none - - zip_name: '' + - zip_name: "" is_always_run: true is_skippable: true - deploy-to-bitrise-io@2: inputs: - - pipeline_intermediate_files: "$ANDROID_RELEASE_AAB_PATH:ANDROID_BUILD" - - debug_mode: 'true' + - pipeline_intermediate_files: $ANDROID_RELEASE_AAB_PATH:ANDROID_BUILD + - debug_mode: "true" - notify_user_groups: none - - zip_name: '' + - zip_name: "" is_always_run: true is_skippable: true From 0c02cba686808eae668161c69b223af6274c707b Mon Sep 17 00:00:00 2001 From: Atanas Chanev Date: Mon, 2 Feb 2026 12:55:19 +0000 Subject: [PATCH 36/36] [skip ci] skip a build and test pull requests