diff --git a/.buildkite/basic/react-native-android-pipeline.yml b/.buildkite/basic/react-native-android-pipeline.yml index af2fdd83b7..f65847bd07 100644 --- a/.buildkite/basic/react-native-android-pipeline.yml +++ b/.buildkite/basic/react-native-android-pipeline.yml @@ -29,6 +29,7 @@ steps: - "android-builder-image" timeout_in_minutes: 60 env: + JAVA_VERSION: "17" REACT_NATIVE_VERSION: "rn0.73" RN_NEW_ARCH: "false" ARTEFACT_NAME: "rn0.73-old-arch" @@ -49,6 +50,7 @@ steps: - "android-builder-image" timeout_in_minutes: 60 env: + JAVA_VERSION: "17" REACT_NATIVE_VERSION: "rn0.73" RN_NEW_ARCH: "true" ARTEFACT_NAME: "rn0.73-new-arch" diff --git a/docker-compose.yml b/docker-compose.yml index e9cdb0ce0a..9badea1b81 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -136,6 +136,7 @@ services: - NOTIFIER_VERSION - ARTEFACT_NAME - JS_SOURCE_DIR + - JAVA_VERSION: "${JAVA_VERSION:-11}" networks: default: aliases: diff --git a/dockerfiles/Dockerfile.react-native-android-builder b/dockerfiles/Dockerfile.react-native-android-builder index f1558c5758..a8eb3e1298 100644 --- a/dockerfiles/Dockerfile.react-native-android-builder +++ b/dockerfiles/Dockerfile.react-native-android-builder @@ -29,4 +29,4 @@ COPY lerna.json . COPY scripts/common.js scripts/react-native-helper.js scripts/ # Do a full build by running the container -CMD run-func scripts/react-native-helper.js buildAndroid "/app/test/react-native/features/fixtures" "/app/features/fixtures" +CMD JAVA_HOME=/usr/local/openjdk-${JAVA_VERSION} run-func scripts/react-native-helper.js buildAndroid "/app/test/react-native/features/fixtures" "/app/features/fixtures"