From e8bb3c174680feb45cc5b0766319358ab691a43e Mon Sep 17 00:00:00 2001 From: Yang Date: Fri, 11 Oct 2024 13:28:33 +1100 Subject: [PATCH 1/2] revert --- lib/sdk-installer.js | 6 +++++- src/sdk-installer.ts | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js index fe7f51385..feb6eb266 100644 --- a/lib/sdk-installer.js +++ b/lib/sdk-installer.js @@ -52,6 +52,11 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk console.log(`::group::Install Android SDK`); const isOnMac = process.platform === 'darwin'; const isArm = process.arch === 'arm64'; + if (!isOnMac) { + yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/platform-tools -R`); + yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/cmdline-tools/latest -R`); + yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION} -R`); + } const cmdlineToolsPath = `${process.env.ANDROID_HOME}/cmdline-tools`; if (!fs.existsSync(cmdlineToolsPath)) { console.log('Installing new cmdline-tools.'); @@ -63,7 +68,6 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk // add paths for commandline-tools and platform-tools core.addPath(`${cmdlineToolsPath}/latest:${cmdlineToolsPath}/latest/bin:${process.env.ANDROID_HOME}/platform-tools`); // set standard AVD path - yield io.mkdirP(`${process.env.HOME}/.android/avd`); core.exportVariable('ANDROID_AVD_HOME', `${process.env.HOME}/.android/avd`); // accept all Android SDK licenses yield exec.exec(`sh -c \\"yes | sdkmanager --licenses > /dev/null"`); diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts index f87028a6f..5c7a0f2c7 100644 --- a/src/sdk-installer.ts +++ b/src/sdk-installer.ts @@ -19,6 +19,12 @@ export async function installAndroidSdk(apiLevel: string, target: string, arch: const isOnMac = process.platform === 'darwin'; const isArm = process.arch === 'arm64'; + if (!isOnMac) { + await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/platform-tools -R`); + await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/cmdline-tools/latest -R`); + await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION} -R`); + } + const cmdlineToolsPath = `${process.env.ANDROID_HOME}/cmdline-tools`; if (!fs.existsSync(cmdlineToolsPath)) { console.log('Installing new cmdline-tools.'); @@ -32,7 +38,6 @@ export async function installAndroidSdk(apiLevel: string, target: string, arch: core.addPath(`${cmdlineToolsPath}/latest:${cmdlineToolsPath}/latest/bin:${process.env.ANDROID_HOME}/platform-tools`); // set standard AVD path - await io.mkdirP(`${process.env.HOME}/.android/avd`); core.exportVariable('ANDROID_AVD_HOME', `${process.env.HOME}/.android/avd`); // accept all Android SDK licenses From ae4167a9994cf390bdc77c75b364362b430403a3 Mon Sep 17 00:00:00 2001 From: Yang Date: Fri, 11 Oct 2024 13:45:47 +1100 Subject: [PATCH 2/2] Still remove changing owner. --- lib/sdk-installer.js | 5 ----- src/sdk-installer.ts | 6 ------ 2 files changed, 11 deletions(-) diff --git a/lib/sdk-installer.js b/lib/sdk-installer.js index feb6eb266..21f355728 100644 --- a/lib/sdk-installer.js +++ b/lib/sdk-installer.js @@ -52,11 +52,6 @@ function installAndroidSdk(apiLevel, target, arch, channelId, emulatorBuild, ndk console.log(`::group::Install Android SDK`); const isOnMac = process.platform === 'darwin'; const isArm = process.arch === 'arm64'; - if (!isOnMac) { - yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/platform-tools -R`); - yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/cmdline-tools/latest -R`); - yield exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION} -R`); - } const cmdlineToolsPath = `${process.env.ANDROID_HOME}/cmdline-tools`; if (!fs.existsSync(cmdlineToolsPath)) { console.log('Installing new cmdline-tools.'); diff --git a/src/sdk-installer.ts b/src/sdk-installer.ts index 5c7a0f2c7..fa0ee16fa 100644 --- a/src/sdk-installer.ts +++ b/src/sdk-installer.ts @@ -19,12 +19,6 @@ export async function installAndroidSdk(apiLevel: string, target: string, arch: const isOnMac = process.platform === 'darwin'; const isArm = process.arch === 'arm64'; - if (!isOnMac) { - await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/platform-tools -R`); - await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/cmdline-tools/latest -R`); - await exec.exec(`sh -c \\"sudo chown $USER:$USER ${process.env.ANDROID_HOME}/build-tools/${BUILD_TOOLS_VERSION} -R`); - } - const cmdlineToolsPath = `${process.env.ANDROID_HOME}/cmdline-tools`; if (!fs.existsSync(cmdlineToolsPath)) { console.log('Installing new cmdline-tools.');