From 005434ec139404325376a7208b5ce04c461de7f0 Mon Sep 17 00:00:00 2001 From: gouri-panda Date: Sun, 17 Dec 2023 23:49:18 +0530 Subject: [PATCH 1/4] Fixes #3615 --- .github/workflows/ci.yml | 38 +++++++++++--------------------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e55487ee9..1b4ec70da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,35 +41,19 @@ jobs: - name: create instrumentation coverage uses: ReactiveCircus/android-emulator-runner@v2 env: - GRADLE_OPTS: "-Dorg.gradle.internal.http.connectionTimeout=60000 -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.network.retry.max.attempts=6 -Dorg.gradle.internal.network.retry.initial.backOff=2000" - if: ${{ matrix.api-level != 33 }} + GRADLE_OPTS: "-Dorg.gradle.internal.http.connectionTimeout=60000 -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.network.retry.max.attempts=6 -Dorg.gradle.internal.network.retry.initial.backOff=2000" with: - api-level: ${{ matrix.api-level }} - target: default - arch: x86_64 - profile: pixel_2 - ram-size: '4096M' - disk-size: '14G' - sdcard-path-or-size: '1000M' - disable-animations: false - script: bash contrib/instrumentation.sh + api-level: ${{ matrix.api-level }} + target: ${{ matrix.api-level != 33 && 'default' || 'google_apis' }} + arch: x86_64 + profile: pixel_2 + ram-size: ${{ matrix.api-level != 33 && '4096M' || '4096M' }} + disk-size: '14G' + sdcard-path-or-size: ${{ matrix.api-level != 33 && '1000M' || '4096M' }} + disable-animations: false + heap-size: ${{ matrix.api-level == 33 && '512M' || '' }} + script: bash contrib/instrumentation.sh - - name: create instrumentation coverage on google_apis for android 33 - uses: ReactiveCircus/android-emulator-runner@v2 - env: - GRADLE_OPTS: "-Dorg.gradle.internal.http.connectionTimeout=60000 -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.network.retry.max.attempts=6 -Dorg.gradle.internal.network.retry.initial.backOff=2000" - if: ${{ matrix.api-level == 33 }} - with: - api-level: ${{ matrix.api-level }} - target: google_apis - arch: x86_64 - profile: pixel_2 - heap-size: '512M' - ram-size: '4096M' - disk-size: '14G' - sdcard-path-or-size: '4096M' - disable-animations: false - script: bash contrib/instrumentation.sh - name: Upload screenshot result uses: actions/upload-artifact@v3 From e23e4190f4c823578a723c643aefe9e2d808856b Mon Sep 17 00:00:00 2001 From: gouri-panda Date: Mon, 18 Dec 2023 17:31:35 +0530 Subject: [PATCH 2/4] updated ram-size --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b4ec70da..d0a2cf6a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: target: ${{ matrix.api-level != 33 && 'default' || 'google_apis' }} arch: x86_64 profile: pixel_2 - ram-size: ${{ matrix.api-level != 33 && '4096M' || '4096M' }} + ram-size: '4096M' disk-size: '14G' sdcard-path-or-size: ${{ matrix.api-level != 33 && '1000M' || '4096M' }} disable-animations: false From a4227f04a1a7709e03e5a4a46b6c3f0e7cf6d22c Mon Sep 17 00:00:00 2001 From: MohitMaliFtechiz Date: Wed, 20 Dec 2023 12:51:12 +0530 Subject: [PATCH 3/4] Fixed incorrect indentation. --- .github/workflows/ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0a2cf6a9..3fa7b6ed5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,18 +41,18 @@ jobs: - name: create instrumentation coverage uses: ReactiveCircus/android-emulator-runner@v2 env: - GRADLE_OPTS: "-Dorg.gradle.internal.http.connectionTimeout=60000 -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.network.retry.max.attempts=6 -Dorg.gradle.internal.network.retry.initial.backOff=2000" + GRADLE_OPTS: "-Dorg.gradle.internal.http.connectionTimeout=60000 -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.network.retry.max.attempts=6 -Dorg.gradle.internal.network.retry.initial.backOff=2000" with: - api-level: ${{ matrix.api-level }} - target: ${{ matrix.api-level != 33 && 'default' || 'google_apis' }} - arch: x86_64 - profile: pixel_2 - ram-size: '4096M' - disk-size: '14G' - sdcard-path-or-size: ${{ matrix.api-level != 33 && '1000M' || '4096M' }} - disable-animations: false - heap-size: ${{ matrix.api-level == 33 && '512M' || '' }} - script: bash contrib/instrumentation.sh + api-level: ${{ matrix.api-level }} + target: ${{ matrix.api-level != 33 && 'default' || 'google_apis' }} + arch: x86_64 + profile: pixel_2 + ram-size: '4096M' + disk-size: '14G' + sdcard-path-or-size: ${{ matrix.api-level != 33 && '1000M' || '4096M' }} + disable-animations: false + heap-size: ${{ matrix.api-level == 33 && '512M' || '' }} + script: bash contrib/instrumentation.sh - name: Upload screenshot result From 394e72be27fb30721ad5d62709d53363b41f6c80 Mon Sep 17 00:00:00 2001 From: MohitMaliFtechiz Date: Wed, 20 Dec 2023 12:56:13 +0530 Subject: [PATCH 4/4] Removed the "develop" branch from CI because it no longer exists, rendering it redundant. --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3fa7b6ed5..29ab06dcf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,6 @@ on: push: branches: - main - - develop pull_request: jobs: