From f504f68b039d2d5d92be71dcbc060073fdd1bf8d Mon Sep 17 00:00:00 2001 From: "K. Shankari" Date: Sun, 5 May 2024 13:18:06 -0700 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=9A=20=F0=9F=91=B7=20Remove=20the=20ch?= =?UTF-8?q?eck=20for=20patcher?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We removed patcher in 41ff1a772756470fc4114ac555b543271180e4be so we should not expect to see it in the file structure any more This should fix the failing build ``` + ls -al /tmp/new-install/Android/sdk + '[' '!' -d /tmp/new-install/Android/sdk/emulator ']' + '[' '!' -d /tmp/new-install/Android/sdk/build-tools ']' + '[' '!' -d /tmp/new-install/Android/sdk/patcher ']' + exit 1 ``` Also, run CI on changes to the SDK package list (i.e. `setup/android_sdk_packages`) so that such errors are caught in the PR stage in the future --- .github/workflows/android-automated-sdk-install.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android-automated-sdk-install.yml b/.github/workflows/android-automated-sdk-install.yml index f4275a98d..2ece9029f 100644 --- a/.github/workflows/android-automated-sdk-install.yml +++ b/.github/workflows/android-automated-sdk-install.yml @@ -6,10 +6,12 @@ on: push: paths: - 'setup/prereq_android_sdk_install.sh' + - 'setup/android_sdk_packages' - '.github/workflows/android-automated-sdk-install.yml' pull_request: paths: - 'setup/prereq_android_sdk_install.sh' + - 'setup/android_sdk_packages' - '.github/workflows/android-automated-sdk-install.yml' schedule: # * is a special character in YAML so you have to quote this string @@ -64,7 +66,6 @@ jobs: ls -al $ANDROID_SDK_ROOT if [ ! -d $ANDROID_SDK_ROOT/emulator ]; then exit 1; fi if [ ! -d $ANDROID_SDK_ROOT/build-tools ]; then exit 1; fi - if [ ! -d $ANDROID_SDK_ROOT/patcher ]; then exit 1; fi if [ ! -d $ANDROID_SDK_ROOT/extras ]; then exit 1; fi if [ ! -d $ANDROID_SDK_ROOT/platforms ]; then exit 1; fi if [ ! -d $ANDROID_SDK_ROOT/platform-tools ]; then exit 1; fi