From 8fd9c6831e1974b9e81c60c9991ff6a2e4469e89 Mon Sep 17 00:00:00 2001 From: rbontrager Date: Tue, 10 Dec 2024 08:56:29 -0600 Subject: [PATCH 01/12] bug/10357-rachael-detox-add-ruby-install-to-e2e-android --- .github/workflows/e2e_android.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index 1f98ad699f..b4053c46b0 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -168,6 +168,23 @@ jobs: echo "${{ secrets.FIREBASE_DIST_FILE_BASE64 }}" | base64 --decode > firebase-dist.json cd ../app echo "${{ secrets.GOOGLE_SERVICES_JSON }}" | base64 --decode > google-services.json + + - name: Install Ruby using rbenv + run: | + # Install Homebrew if not already installed + if ! command -v brew &>/dev/null; then + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zshrc + eval "$(/opt/homebrew/bin/brew shellenv)" + fi + # Install rbenv and ruby-build + brew install rbenv ruby-build + rbenv init + echo 'eval "$(rbenv init -)"' >> ~/.zshrc + eval "$(rbenv init -)" + # Install the required Ruby version + rbenv install -s 3.0.2 + rbenv global 3.0.2 - name: Setup ruby and restore bundler cache uses: ruby/setup-ruby@v1 From 90016d1c96a282b71c78c7faee9821a4287ad4c7 Mon Sep 17 00:00:00 2001 From: rbontrager Date: Tue, 10 Dec 2024 08:57:28 -0600 Subject: [PATCH 02/12] Update e2e_android.yml --- .github/workflows/e2e_android.yml | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index b4053c46b0..61bcdc8f49 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -168,23 +168,23 @@ jobs: echo "${{ secrets.FIREBASE_DIST_FILE_BASE64 }}" | base64 --decode > firebase-dist.json cd ../app echo "${{ secrets.GOOGLE_SERVICES_JSON }}" | base64 --decode > google-services.json - + - name: Install Ruby using rbenv - run: | - # Install Homebrew if not already installed - if ! command -v brew &>/dev/null; then - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zshrc - eval "$(/opt/homebrew/bin/brew shellenv)" - fi - # Install rbenv and ruby-build - brew install rbenv ruby-build - rbenv init - echo 'eval "$(rbenv init -)"' >> ~/.zshrc - eval "$(rbenv init -)" - # Install the required Ruby version - rbenv install -s 3.0.2 - rbenv global 3.0.2 + run: | + # Install Homebrew if not already installed + if ! command -v brew &>/dev/null; then + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zshrc + eval "$(/opt/homebrew/bin/brew shellenv)" + fi + # Install rbenv and ruby-build + brew install rbenv ruby-build + rbenv init + echo 'eval "$(rbenv init -)"' >> ~/.zshrc + eval "$(rbenv init -)" + # Install the required Ruby version + rbenv install -s 3.0.2 + rbenv global 3.0.2 - name: Setup ruby and restore bundler cache uses: ruby/setup-ruby@v1 From d1b7dca69e3105794ae9bbf90f7e34a8532e6a33 Mon Sep 17 00:00:00 2001 From: rbontrager Date: Tue, 10 Dec 2024 09:10:57 -0600 Subject: [PATCH 03/12] Update e2e_android.yml --- .github/workflows/e2e_android.yml | 34 +++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index 61bcdc8f49..68026de806 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -141,7 +141,7 @@ jobs: matrix-e2e-android: if: (!cancelled()) && needs.output_detox_tests_to_run.outputs.output1 != '' - runs-on: macos-latest-xl + runs-on: macos-14-xl needs: [start_slack_thread, output_detox_tests_to_run] strategy: fail-fast: false @@ -169,22 +169,22 @@ jobs: cd ../app echo "${{ secrets.GOOGLE_SERVICES_JSON }}" | base64 --decode > google-services.json - - name: Install Ruby using rbenv - run: | - # Install Homebrew if not already installed - if ! command -v brew &>/dev/null; then - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zshrc - eval "$(/opt/homebrew/bin/brew shellenv)" - fi - # Install rbenv and ruby-build - brew install rbenv ruby-build - rbenv init - echo 'eval "$(rbenv init -)"' >> ~/.zshrc - eval "$(rbenv init -)" - # Install the required Ruby version - rbenv install -s 3.0.2 - rbenv global 3.0.2 + # - name: Install Ruby using rbenv + # run: | + # # Install Homebrew if not already installed + # if ! command -v brew &>/dev/null; then + # /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + # echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zshrc + # eval "$(/opt/homebrew/bin/brew shellenv)" + # fi + # # Install rbenv and ruby-build + # brew install rbenv ruby-build + # rbenv init + # echo 'eval "$(rbenv init -)"' >> ~/.zshrc + # eval "$(rbenv init -)" + # # Install the required Ruby version + # rbenv install -s 3.0.2 + # rbenv global 3.0.2 - name: Setup ruby and restore bundler cache uses: ruby/setup-ruby@v1 From a0758842079a396029b7a8904cacbbcacbfa59b2 Mon Sep 17 00:00:00 2001 From: rbontrager Date: Tue, 10 Dec 2024 09:18:23 -0600 Subject: [PATCH 04/12] Update e2e_android.yml --- .github/workflows/e2e_android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index 68026de806..ff33bacea3 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -141,7 +141,7 @@ jobs: matrix-e2e-android: if: (!cancelled()) && needs.output_detox_tests_to_run.outputs.output1 != '' - runs-on: macos-14-xl + runs-on: macos-14 needs: [start_slack_thread, output_detox_tests_to_run] strategy: fail-fast: false From dfc64a58058884cddfc079be1612a0bc191c3043 Mon Sep 17 00:00:00 2001 From: rbontrager Date: Tue, 10 Dec 2024 09:36:13 -0600 Subject: [PATCH 05/12] Update e2e_android.yml --- .github/workflows/e2e_android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index ff33bacea3..a492920db3 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -189,7 +189,7 @@ jobs: - name: Setup ruby and restore bundler cache uses: ruby/setup-ruby@v1 with: - ruby-version: '3.0.2' + ruby-version: '3.3' bundler-cache: true working-directory: VAMobile/android From 3b677756e3019f21f967ce80705692f2cd0e0de2 Mon Sep 17 00:00:00 2001 From: rbontrager Date: Tue, 10 Dec 2024 09:48:18 -0600 Subject: [PATCH 06/12] Update e2e_android.yml --- .github/workflows/e2e_android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index a492920db3..9168dab7bb 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -141,7 +141,7 @@ jobs: matrix-e2e-android: if: (!cancelled()) && needs.output_detox_tests_to_run.outputs.output1 != '' - runs-on: macos-14 + runs-on: macos-13 needs: [start_slack_thread, output_detox_tests_to_run] strategy: fail-fast: false From a667165ac52993520a49da811c2bd94cab1ebcdd Mon Sep 17 00:00:00 2001 From: rbontrager Date: Tue, 10 Dec 2024 11:17:31 -0600 Subject: [PATCH 07/12] Update e2e_android.yml --- .github/workflows/e2e_android.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index 9168dab7bb..4cc7d6d9ec 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -189,7 +189,7 @@ jobs: - name: Setup ruby and restore bundler cache uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3' + ruby-version: '3.0.2' bundler-cache: true working-directory: VAMobile/android From dc7ec77be642308c644fedf487ca51b3cb4628d4 Mon Sep 17 00:00:00 2001 From: rbontrager Date: Tue, 10 Dec 2024 13:01:25 -0600 Subject: [PATCH 08/12] Update e2e_android.yml --- .github/workflows/e2e_android.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index 4cc7d6d9ec..27c833f0aa 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -225,8 +225,10 @@ jobs: profile: pixel_6_pro force-avd-creation: false disable-animations: true + cores: 3 arch: x86_64 avd-name: Pixel_6_Pro_API_33 + emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none script: yarn e2e:android-test /e2e/tests/${{matrix.testsuite}} --updateSnapshot continue-on-error: true From c27f01e4bd5bea7d61a164c3a482be21338e760a Mon Sep 17 00:00:00 2001 From: rbontrager Date: Tue, 10 Dec 2024 13:50:10 -0600 Subject: [PATCH 09/12] Update e2e_android.yml --- .github/workflows/e2e_android.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index 27c833f0aa..cc619565ba 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -221,7 +221,7 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: working-directory: VAMobile - api-level: 33 + api-level: 30 profile: pixel_6_pro force-avd-creation: false disable-animations: true @@ -238,7 +238,7 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: working-directory: VAMobile - api-level: 33 + api-level: 30 profile: pixel_6_pro force-avd-creation: false disable-animations: true From e56e2be407c76fc37ce8f3e48468ed07da3bb357 Mon Sep 17 00:00:00 2001 From: rbontrager Date: Tue, 10 Dec 2024 14:34:46 -0600 Subject: [PATCH 10/12] Update e2e_android.yml --- .github/workflows/e2e_android.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index cc619565ba..39dfc0f845 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -225,10 +225,8 @@ jobs: profile: pixel_6_pro force-avd-creation: false disable-animations: true - cores: 3 arch: x86_64 avd-name: Pixel_6_Pro_API_33 - emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none script: yarn e2e:android-test /e2e/tests/${{matrix.testsuite}} --updateSnapshot continue-on-error: true @@ -253,7 +251,7 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: working-directory: VAMobile - api-level: 33 + api-level: 30 profile: pixel_6_pro force-avd-creation: false disable-animations: true @@ -268,7 +266,7 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: working-directory: VAMobile - api-level: 33 + api-level: 30 profile: pixel_6_pro force-avd-creation: false disable-animations: true From eb7a6bdd05e3c9c927839573422c9c7dc077dc44 Mon Sep 17 00:00:00 2001 From: rbontrager Date: Tue, 10 Dec 2024 14:47:04 -0600 Subject: [PATCH 11/12] Update e2e_android.yml --- .github/workflows/e2e_android.yml | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index 39dfc0f845..f47903b3d6 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -169,23 +169,6 @@ jobs: cd ../app echo "${{ secrets.GOOGLE_SERVICES_JSON }}" | base64 --decode > google-services.json - # - name: Install Ruby using rbenv - # run: | - # # Install Homebrew if not already installed - # if ! command -v brew &>/dev/null; then - # /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - # echo 'eval "$(/opt/homebrew/bin/brew shellenv)"' >> ~/.zshrc - # eval "$(/opt/homebrew/bin/brew shellenv)" - # fi - # # Install rbenv and ruby-build - # brew install rbenv ruby-build - # rbenv init - # echo 'eval "$(rbenv init -)"' >> ~/.zshrc - # eval "$(rbenv init -)" - # # Install the required Ruby version - # rbenv install -s 3.0.2 - # rbenv global 3.0.2 - - name: Setup ruby and restore bundler cache uses: ruby/setup-ruby@v1 with: From b0ce3cde1a4509526453bb25cb6d2b3709b6df8a Mon Sep 17 00:00:00 2001 From: rbontrager Date: Wed, 11 Dec 2024 07:56:32 -0600 Subject: [PATCH 12/12] Update e2e_android.yml --- .github/workflows/e2e_android.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e_android.yml b/.github/workflows/e2e_android.yml index f47903b3d6..a2943d8219 100644 --- a/.github/workflows/e2e_android.yml +++ b/.github/workflows/e2e_android.yml @@ -204,7 +204,7 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: working-directory: VAMobile - api-level: 30 + api-level: 28 profile: pixel_6_pro force-avd-creation: false disable-animations: true @@ -219,7 +219,7 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: working-directory: VAMobile - api-level: 30 + api-level: 28 profile: pixel_6_pro force-avd-creation: false disable-animations: true @@ -234,7 +234,7 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: working-directory: VAMobile - api-level: 30 + api-level: 28 profile: pixel_6_pro force-avd-creation: false disable-animations: true @@ -249,7 +249,7 @@ jobs: uses: reactivecircus/android-emulator-runner@v2 with: working-directory: VAMobile - api-level: 30 + api-level: 28 profile: pixel_6_pro force-avd-creation: false disable-animations: true