diff --git a/.github/workflows/_android-build-test.yml b/.github/workflows/_android-build-test.yml index 9cb8bb287a9..d599e769b8b 100644 --- a/.github/workflows/_android-build-test.yml +++ b/.github/workflows/_android-build-test.yml @@ -131,7 +131,7 @@ jobs: export COMMAND # shellcheck disable=SC2016 - COMMAND='(echo "sudo chown -R jenkins workspace && cd workspace && ./.circleci/scripts/build_android_gradle.sh" | docker exec -u jenkins -e BUILD_LITE_INTERPRETER -e GRADLE_OFFLINE=1 -i "$id" bash) 2>&1' + COMMAND='(echo "sudo chown -R jenkins workspace && cd workspace && ./scripts/build_android_gradle.sh" | docker exec -u jenkins -e BUILD_LITE_INTERPRETER -e GRADLE_OFFLINE=1 -i "$id" bash) 2>&1' echo "${COMMAND}" > ./command.sh && bash ./command.sh # Skip docker push as this job is purely for size analysis purpose. # Result binaries are already in `/home/circleci/project/` as it's mounted instead of copied. diff --git a/.github/workflows/_android-full-build-test.yml b/.github/workflows/_android-full-build-test.yml index 965667b7da7..7a0c4377eca 100644 --- a/.github/workflows/_android-full-build-test.yml +++ b/.github/workflows/_android-full-build-test.yml @@ -157,7 +157,7 @@ jobs: docker cp "${GITHUB_WORKSPACE}/build_android_install_x86_32" "${ID_X86_32}:/var/lib/jenkins/workspace/build_android_install_x86_32" # run gradle buildRelease - (echo "./.circleci/scripts/build_android_gradle.sh" | docker exec \ + (echo "./scripts/build_android_gradle.sh" | docker exec \ -e BUILD_ENVIRONMENT="pytorch-linux-focal-py3-clang9-android-ndk-r21e-gradle-build" \ -e MAX_JOBS="$(nproc --ignore=2)" \ -e AWS_DEFAULT_REGION \ diff --git a/.circleci/scripts/build_android_gradle.sh b/scripts/build_android_gradle.sh similarity index 97% rename from .circleci/scripts/build_android_gradle.sh rename to scripts/build_android_gradle.sh index 8f71ed3a1c6..fc27c5dd251 100755 --- a/.circleci/scripts/build_android_gradle.sh +++ b/scripts/build_android_gradle.sh @@ -40,7 +40,7 @@ if [[ "${BUILD_ENVIRONMENT}" == *-gradle-custom-build* ]]; then # Install torch & torchvision - used to download & dump used ops from test model. retry pip install torch torchvision --progress-bar off - exec "$(dirname "${BASH_SOURCE[0]}")/../../android/build_test_app_custom.sh" armeabi-v7a + exec "$(dirname "${BASH_SOURCE[0]}")/../android/build_test_app_custom.sh" armeabi-v7a fi # Run default build