From d5008e9b9b79c118b0c79521e967998f1918d684 Mon Sep 17 00:00:00 2001 From: Diego Mello Date: Fri, 7 Jul 2023 16:06:41 -0300 Subject: [PATCH] Refactor android-executor --- .circleci/config.yml | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d353f57b6..b15837a55 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,13 @@ defaults: &defaults android-img: &android-img docker: - - image: cimg/android:2023.04.1-node + - image: cimg/android:2023.06.1-node + +android-executor: &android-executor + executor: + name: android/android-machine + resource-class: xlarge + tag: 2023.06.1 orbs: android: circleci/android@2.1.2 @@ -389,10 +395,7 @@ jobs: # Android builds android-build-experimental: <<: *defaults - executor: - name: android/android-machine - resource-class: xlarge - tag: 2023.04.1 + <<: *android-executor environment: <<: *android-env <<: *bash-env @@ -402,21 +405,19 @@ jobs: # Android automatic builds android-automatic-build-experimental: <<: *defaults - <<: *android-img + <<: *android-executor environment: <<: *android-env <<: *bash-env - resource_class: xlarge steps: - android-build android-build-official: <<: *defaults - <<: *android-img + <<: *android-executor environment: <<: *android-env <<: *bash-env - resource_class: xlarge steps: - android-build @@ -451,10 +452,7 @@ jobs: e2e-build-android: <<: *defaults - executor: - name: android/android-machine - resource-class: xlarge - tag: 2023.04.1 + <<: *android-executor environment: <<: *android-env steps: @@ -500,10 +498,7 @@ jobs: e2e-test-android: <<: *defaults - executor: - name: android/android-machine - resource-class: xlarge - tag: 2023.04.1 + <<: *android-executor parallelism: 4 steps: - checkout