From 36c2f4706f6d38189144933fd06c860cc7a50ad8 Mon Sep 17 00:00:00 2001 From: Siddarth Kumar Date: Tue, 19 Dec 2023 20:11:25 +0530 Subject: [PATCH] Fix crash on x86_64 emulators (#17773) In this commit we bump jenkins lib tag to enable building e2e with 64bit Co-authored-by: Anton Iakimov --- android/gradle.properties | 2 +- ci/Jenkinsfile.android | 2 +- ci/Jenkinsfile.combined | 2 +- ci/Jenkinsfile.e2e-nightly | 2 +- ci/Jenkinsfile.ios | 2 +- ci/Jenkinsfile.tests | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/android/gradle.properties b/android/gradle.properties index 59a49ca4e2..0d9cfbb18f 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -42,7 +42,7 @@ KEYSTORE_KEY_PASSWORD=password # By default we build a mostly universal APK ANDROID_ABI_SPLIT=false # Some platforms are excluded though -ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86 +ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86;x86_64 org.gradle.jvmargs=-Xmx8704M diff --git a/ci/Jenkinsfile.android b/ci/Jenkinsfile.android index f37df88fe7..4ded4bb45d 100644 --- a/ci/Jenkinsfile.android +++ b/ci/Jenkinsfile.android @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.7.15' +library 'status-jenkins-lib@v1.8.4' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/Jenkinsfile.combined b/ci/Jenkinsfile.combined index 6568442ecf..3e31b346c7 100644 --- a/ci/Jenkinsfile.combined +++ b/ci/Jenkinsfile.combined @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.7.15' +library 'status-jenkins-lib@v1.8.4' pipeline { agent { label 'linux' } diff --git a/ci/Jenkinsfile.e2e-nightly b/ci/Jenkinsfile.e2e-nightly index 8e6d48d3e3..e44a6478be 100644 --- a/ci/Jenkinsfile.e2e-nightly +++ b/ci/Jenkinsfile.e2e-nightly @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.7.15' +library 'status-jenkins-lib@v1.8.4' pipeline { agent { label 'linux' } diff --git a/ci/Jenkinsfile.ios b/ci/Jenkinsfile.ios index 2fff2de8f3..9a5d370ac9 100644 --- a/ci/Jenkinsfile.ios +++ b/ci/Jenkinsfile.ios @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.7.15' +library 'status-jenkins-lib@v1.8.4' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild() diff --git a/ci/Jenkinsfile.tests b/ci/Jenkinsfile.tests index 0c4eb0679f..5e8ac4afe7 100644 --- a/ci/Jenkinsfile.tests +++ b/ci/Jenkinsfile.tests @@ -1,5 +1,5 @@ #!/usr/bin/env groovy -library 'status-jenkins-lib@v1.7.15' +library 'status-jenkins-lib@v1.8.4' /* Options section can't access functions in objects. */ def isPRBuild = utils.isPRBuild()