Skip to content

Commit

Permalink
Use default Android image on CircleCI (JDK11)
Browse files Browse the repository at this point in the history
  • Loading branch information
malinajirka committed Sep 14, 2020
1 parent ce5459c commit 05f0634
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ parameters:
default: false

executors:
android-jdk8:
docker:
- image: circleci/android@sha256:061e2535826cc3fe4c4a440e716bf06c36c80401ee635c339c6803b3e427ebb3
android-default:
- name: android/default
- api-version: "28"

commands:
copy-gradle-properties:
Expand Down Expand Up @@ -110,7 +110,7 @@ jobs:
command: mv libs/gutenberg-mobile/bundle/android/App.js libs/gutenberg-mobile/gutenberg/packages/react-native-bridge/android/build/assets/index.android.bundle
- save-gutenberg-bundle-cache
test:
executor: android-jdk8
executor: android-default
steps:
- git/shallow-checkout:
init-submodules: true
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
- android/save-gradle-cache
- android/save-test-results
lint:
executor: android-jdk8
executor: android-default
steps:
- git/shallow-checkout:
init-submodules: true
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
- android/save-gradle-cache
- android/save-lint-results
Installable Build:
executor: android-jdk8
executor: android-default
steps:
- git/shallow-checkout:
init-submodules: true
Expand Down Expand Up @@ -230,7 +230,7 @@ jobs:
path: Artifacts
destination: Artifacts
Release Build:
executor: android-jdk8
executor: android-default
environment:
JVM_OPTS: -Xmx2048m
steps:
Expand Down Expand Up @@ -308,7 +308,7 @@ jobs:
description: Post to Slack when tests fail. SLACK_WEBHOOK ENV variable must be set.
type: boolean
default: false
executor: android-jdk8
executor: android-default
steps:
- git/shallow-checkout:
init-submodules: true
Expand Down Expand Up @@ -351,7 +351,7 @@ jobs:
include_project_field: false
failure_message: ':red_circle: WordPress Android connected tests failed on \`${CIRCLE_BRANCH}\` branch after merge by ${CIRCLE_USERNAME}. See <https://console.firebase.google.com/u/0/project/api-project-108380595987/testlab/histories/bh.e0c3a59bd9ed670|Firebase console test results> for details.\n\nPlease reach out in #platform9 if you think this failure is not caused by your changes, so we can investigate.'
raw-screenshots:
executor: android-jdk8
executor: android-default
working_directory: /tmp/workspace
steps:
- git/shallow-checkout:
Expand Down Expand Up @@ -465,7 +465,7 @@ jobs:
failure_message: ':red_circle: WordPress Android Screenshots failed on \`${CIRCLE_BRANCH}\` branch. See <https://console.firebase.google.com/u/0/project/api-project-108380595987/testlab/histories/bh.e0c3a59bd9ed670|Firebase console test results> for details.\n\nPlease reach out in #platform9 if you think this failure is not caused by your changes, so we can investigate.'
success_message: ':tada: WordPress Android Promo Screenshots have been generated and are ready to be reviewed. Download them <https://${CIRCLE_BUILD_NUM}-9306568-gh.circle-artifacts.com/0/fastlane/metadata/Android-Promo-Screenshots.zip|here>'
WordPressUtils Connected Tests:
executor: android-jdk8
executor: android-default
steps:
- git/shallow-checkout:
init-submodules: true
Expand Down Expand Up @@ -513,7 +513,7 @@ jobs:
name: Validate login strings
command: bundle exec fastlane validate_login_strings pr_url:$CIRCLE_PULL_REQUEST
translation-review-build:
executor: android-jdk8
executor: android-default
environment:
APP_VERSION_PREFIX: << pipeline.parameters.translation_review_lang_id >>
steps:
Expand Down

0 comments on commit 05f0634

Please sign in to comment.