Skip to content

Commit c541e14

Browse files
author
Maxim Lobanov
committed
w
1 parent 1a616e4 commit c541e14

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

dist/index.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47557,9 +47557,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
4755747557
Object.defineProperty(exports, "__esModule", { value: true });
4755847558
const cache = __importStar(__webpack_require__(692));
4755947559
const core = __importStar(__webpack_require__(470));
47560+
const exec = __importStar(__webpack_require__(986));
4756047561
const os = __importStar(__webpack_require__(87));
4756147562
const sdk_manager_1 = __webpack_require__(857);
4756247563
const utils_1 = __webpack_require__(611);
47564+
const patchUbuntuPermissions = async (androidHome) => {
47565+
core.startGroup("Patch permissions for $ANDROID_HOME on Ubuntu");
47566+
await exec.exec("sudo", ["chmod", "-R", "a+rwx", androidHome]);
47567+
core.endGroup();
47568+
};
4756347569
const restoreCache = async (sdkmanager, foundPackage) => {
4756447570
core.startGroup("Trying to restore package from cache...");
4756547571
const cacheKey = utils_1.getPackageCacheKey(foundPackage);
@@ -47589,6 +47595,9 @@ const run = async () => {
4758947595
throw new Error("ANDROID_HOME env variable is not defined");
4759047596
}
4759147597
const sdkmanager = new sdk_manager_1.SDKManager(androidHome);
47598+
if (os.platform() === "linux") {
47599+
await patchUbuntuPermissions(androidHome);
47600+
}
4759247601
core.startGroup("Getting list of available components");
4759347602
const allPackages = await sdkmanager.getAllPackagesInfo();
4759447603
core.endGroup();

src/setup-android-tools.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
import * as cache from "@actions/cache";
22
import * as core from "@actions/core";
3+
import * as exec from "@actions/exec";
34
import * as os from "os";
45
import { SDKManager } from "./sdk-manager";
56
import { getListInput, getBooleanInput, getPackageCacheKey } from "./utils";
67
import { AndroidPackageInfo } from "./sdk-manager-parser";
78

9+
const patchUbuntuPermissions = async(androidHome: string): Promise<void> => {
10+
core.startGroup("Patch permissions for $ANDROID_HOME on Ubuntu");
11+
await exec.exec("sudo", ["chmod", "-R", "a+rwx", androidHome]);
12+
core.endGroup();
13+
};
14+
815
const restoreCache = async(sdkmanager: SDKManager, foundPackage: AndroidPackageInfo): Promise<boolean> => {
916
core.startGroup("Trying to restore package from cache...");
1017

@@ -41,6 +48,10 @@ const run = async(): Promise<void> => {
4148
if (!androidHome) { throw new Error("ANDROID_HOME env variable is not defined"); }
4249
const sdkmanager = new SDKManager(androidHome);
4350

51+
if (os.platform() === "linux") {
52+
await patchUbuntuPermissions(androidHome);
53+
}
54+
4455
core.startGroup("Getting list of available components");
4556
const allPackages = await sdkmanager.getAllPackagesInfo();
4657
core.endGroup();

0 commit comments

Comments
 (0)