Skip to content

Commit

Permalink
chore: bump linux build machine version (#10708)
Browse files Browse the repository at this point in the history 
## **Description**

This PR upgrades the linux machines in the Bitrise pipeline. 

## **Related issues**

Fixes: #10530 

## **Manual testing steps**

1. Run Bitrise Smoke Tests

## **Screenshots/Recordings**

NA

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: metamaskbot <[email protected]>
  • Loading branch information
@sethkfman @metamaskbot
sethkfman and metamaskbot authored Aug 20, 2024
1 parent 5d05f0a commit 6817816
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 53 deletions.
2 changes: 1 addition & 1 deletion android/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
# Default value: -Xmx512m -XX:MaxMetaspaceSize=256m
org.gradle.jvmargs=-Xmx2048m -XX:MaxMetaspaceSize=512m
org.gradle.jvmargs=-Xmx4g -XX:MaxMetaspaceSize=512m

# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
Expand Down
71 changes: 19 additions & 52 deletions bitrise.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ workflows:
is_always_run: false
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: standard

# Send a Slack message when workflow succeeds
Expand Down Expand Up @@ -438,7 +438,7 @@ workflows:
android_build_regression_tests:
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: elite-xl
envs:
- TEST_SUITE: 'Regression'
Expand All @@ -447,7 +447,7 @@ workflows:
android_run_regression_tests:
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: elite-xl
envs:
- TEST_SUITE: 'Regression'
Expand All @@ -456,7 +456,7 @@ workflows:
run_tag_upgrade_android:
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: elite-xl
envs:
- PRODUCTION_APP_URL: 'bs://f0eefdd04dd0b913eb8b6494e4990e3e9f1c2bd3' # Last production's QA build
Expand All @@ -473,7 +473,7 @@ workflows:
- TEST_TYPE: 'performance'
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: elite-xl
after_run:
- wdio_android_e2e_test
Expand All @@ -488,7 +488,7 @@ workflows:
run_tag_smoke_accounts_android:
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: elite-xl
envs:
- TEST_SUITE_FOLDER: './e2e/specs/accounts/*'
Expand All @@ -504,7 +504,7 @@ workflows:
run_tag_smoke_assets_android:
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: elite-xl
envs:
- TEST_SUITE_FOLDER: './e2e/specs/assets/*'
Expand All @@ -520,7 +520,7 @@ workflows:
run_tag_smoke_confirmations_android:
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: elite-xl
envs:
- TEST_SUITE_FOLDER: './e2e/specs/confirmations/*'
Expand All @@ -536,7 +536,7 @@ workflows:
run_tag_smoke_swaps_android:
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: elite-xl
envs:
- TEST_SUITE_FOLDER: './e2e/specs/swaps/*'
Expand All @@ -555,7 +555,7 @@ workflows:
run_tag_smoke_core_android:
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: elite-xl
envs:
- TEST_SUITE_FOLDER: './e2e/spec/*/**/*'
Expand All @@ -581,20 +581,13 @@ workflows:
inputs:
- ndk_version: $NDK_VERSION
- gradlew_path: $PROJECT_LOCATION/gradlew
- script@1:
title: Download cmake 3.22.1 with sdkmanager
is_always_run: false
inputs:
- content: |-
#!/usr/bin/env bash
"${ANDROID_HOME}/tools/bin/sdkmanager" "cmake;3.22.1"
- script@1:
title: Install CCache & symlink
inputs:
- content: |-
#!/usr/bin/env bash
sudo apt update
sudo apt install ccache
sudo apt install ccache -y
- restore-cache@2:
title: Restore CCache
inputs:
Expand Down Expand Up @@ -643,7 +636,7 @@ workflows:
meta:
bitrise.io:
machine_type_id: elite-xl
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
android_e2e_test:
before_run:
- setup
Expand Down Expand Up @@ -674,13 +667,6 @@ workflows:
title: Restore cache node_modules
inputs:
- key: node_modules-{{ .OS }}-{{ .Arch }}-{{ getenv "BRANCH_COMMIT_HASH" }}
- script@1:
title: Download cmake 3.22.1 with sdkmanager
is_always_run: false
inputs:
- content: |-
#!/usr/bin/env bash
"${ANDROID_HOME}/tools/bin/sdkmanager" "cmake;3.22.1"
- avd-manager@1:
inputs:
- api_level: '34'
Expand Down Expand Up @@ -743,7 +729,7 @@ workflows:
meta:
bitrise.io:
machine_type_id: elite-xl
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
ios_api_specs:
before_run:
- setup
Expand Down Expand Up @@ -1027,13 +1013,6 @@ workflows:
inputs:
- ndk_version: $NDK_VERSION
- gradlew_path: $PROJECT_LOCATION/gradlew
- script@1:
inputs:
- content: |-
#!/usr/bin/env bash
"${ANDROID_HOME}/tools/bin/sdkmanager" "cmake;3.22.1"
title: Download cmake 3.22.1 with sdkmanager
is_always_run: false
- script@1:
inputs:
- content: |-
Expand Down Expand Up @@ -1080,7 +1059,7 @@ workflows:
title: Bitrise Deploy Sourcemaps
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: elite-xl
build_android_qa:
before_run:
Expand All @@ -1103,13 +1082,7 @@ workflows:
inputs:
- ndk_version: $NDK_VERSION
- gradlew_path: $PROJECT_LOCATION/gradlew
- script@1:
inputs:
- content: |-
#!/usr/bin/env bash
"${ANDROID_HOME}/tools/bin/sdkmanager" "cmake;3.22.1"
title: Download cmake 3.22.1 with sdkmanager
is_always_run: false

- script@1:
inputs:
- content: |-
Expand Down Expand Up @@ -1151,7 +1124,7 @@ workflows:
title: Bitrise Deploy Sourcemaps
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: elite-xl
_upload_apk_to_browserstack:
steps:
Expand Down Expand Up @@ -1231,7 +1204,7 @@ workflows:
title: Deploy test report
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: standard
deploy_android_to_store:
steps:
Expand Down Expand Up @@ -1420,13 +1393,7 @@ workflows:
inputs:
- ndk_revision: $NDK_VERSION
- gradlew_path: $PROJECT_LOCATION/gradlew
- script@1:
inputs:
- content: |-
#!/usr/bin/env bash
"${ANDROID_HOME}/tools/bin/sdkmanager" "cmake;3.22.1"
title: Download cmake 3.22.1 with sdkmanager
is_always_run: false

- script@1:
inputs:
- content: |-
Expand Down Expand Up @@ -1473,7 +1440,7 @@ workflows:
title: Bitrise Deploy Sourcemaps
meta:
bitrise.io:
stack: linux-docker-android-20.04
stack: linux-docker-android-22.04
machine_type_id: elite-xl

app:
Expand Down

0 comments on commit 6817816

Please sign in to comment.