diff --git a/tools/ci_build/github/android/setup_gradle_wrapper.sh b/tools/ci_build/github/android/setup_gradle_wrapper.sh new file mode 100644 index 0000000000..b5fa40dd25 --- /dev/null +++ b/tools/ci_build/github/android/setup_gradle_wrapper.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# This script will setup gradlew to use gradle version 6.8.3 for Android CI, +# since the macOS pipeline is using gradle 7.0 which will fail the java build +# See, https://github.com/actions/virtual-environments/issues/3195 + +set -e +set -x + +if [ $# -ne 1 ]; then + echo "One command line argument, the ORT root directory, is expected" +fi + +ORT_ROOT=$1 + +pushd ${ORT_ROOT}/java +gradle wrapper --gradle-version 6.8.3 --no-daemon --no-watch-fs +./gradlew --version +popd diff --git a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml index 755345808d..e593931cd0 100644 --- a/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml +++ b/tools/ci_build/github/azure-pipelines/android-x86_64-crosscompile-ci-pipeline.yml @@ -15,6 +15,9 @@ jobs: - script: brew install coreutils ninja displayName: Install coreutils and ninja + - script: /bin/bash tools/ci_build/github/android/setup_gradle_wrapper.sh $(pwd) + displayName: Setup gradle wrapper to use gradle 6.8.3 + - script: | python3 tools/python/run_android_emulator.py \ --android-sdk-root ${ANDROID_SDK_ROOT} \