Skip to content

Commit 8ff29a4

Browse files
daviddexterdaviddexter
committed
chore : debugging actions
- pre-release
1 parent d21041b commit 8ff29a4

File tree

4 files changed

+80
-22
lines changed

4 files changed

+80
-22
lines changed

‎dist/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -1362,6 +1362,7 @@ function setupAndroid(version) {
13621362
yield exec.exec(`sudo chown -R ${user}:${user} ${homeDirectory}/android`);
13631363
yield exec.exec(`sudo chown -R ${user}:${user} ${homeDirectory}/.android`);
13641364
yield exec.exec(`bash -c " ls -la ${homeDirectory}/android/sdk/tools/"`);
1365+
yield exec.exec(`bash -c "sdkmanager --list"`);
13651366
yield exec.exec(`bash -c "sudo ${homeDirectory}/android/sdk/tools/bin/sdkmanager "tools" "platform-tools" "`);
13661367
yield exec.exec(`bash -c "sudo ${homeDirectory}/android/sdk/tools/bin/sdkmanager "build-tools;${version}.0.0" "`);
13671368
yield exec.exec(`bash -c "sudo ${homeDirectory}/android/sdk/tools/bin/sdkmanager "platforms;android-${version}" "`);

‎package-lock.json

+36
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"dependencies": {
1818
"@actions/core": "^1.2.2",
1919
"@actions/exec": "^1.0.3",
20-
"@actions/io": "^1.0.2"
20+
"@actions/io": "^1.0.2",
21+
"@actions/tool-cache": "^1.3.3"
2122
},
2223
"devDependencies": {
2324
"@types/node": "^13.7.4",

‎src/setup.ts

+41-21
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,14 @@ import * as path from 'path';
22
import * as exec from '@actions/exec';
33
import * as core from '@actions/core';
44
import * as io from '@actions/io';
5+
import * as tc from '@actions/tool-cache';
56

67

7-
const IS_WINDOWS = process.platform === 'win32';
8-
const IS_DARWIN = process.platform === 'darwin';
9-
const IS_LINUX = process.platform === 'linux';
8+
// const IS_WINDOWS = process.platform === 'win32';
9+
// const IS_DARWIN = process.platform === 'darwin';
10+
// const IS_LINUX = process.platform === 'linux';
1011

11-
let homeDirectory = process.env['HOME'] || process.env['USERPROFILE'];
12+
let homeDirectory = process.env['HOME'] || process.env['USERPROFILE'] as string;
1213
let user = process.env['USER'];
1314
interface Options { listeners: {} };
1415

@@ -17,6 +18,8 @@ export async function setupAndroid(version: string): Promise<void>{
1718
await exec.exec('sudo apt-get update');
1819
await exec.exec('sudo apt-get install -qqy ca-certificates curl apt-transport-https');
1920
await exec.exec('sudo apt-get install -qqy unzip python3-cffi lsb-release');
21+
22+
// download firebase
2023
console.log('=== installing firebase tools ===');
2124
await exec.exec(`bash -c "curl -sL https://firebase.tools | bash"` );
2225

@@ -28,41 +31,58 @@ export async function setupAndroid(version: string): Promise<void>{
2831
},
2932
};
3033

34+
//setup env variables to be used to download google-cloud-sdk
3135
await exec.exec('lsb_release -c -s',undefined,lsbReleaseObj);
3236
core.exportVariable('LSB_RELEASE', lsbRelease);
3337
core.exportVariable('CLOUD_SDK_REPO', `cloud-sdk-${lsbRelease}`);
3438

3539
console.log('=== installing gcloud SDK ===');
3640
await exec.exec('echo "deb https://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list');
37-
await exec.exec(`bash -c "curl https://packages.cloud.google.com/apt/doc/apt-key.gpg --output ${homeDirectory}/key.gpg "`);
41+
42+
// download gcloud gpg key
43+
// await exec.exec(`bash -c "curl https://packages.cloud.google.com/apt/doc/apt-key.gpg --output ${homeDirectory}/key.gpg "`);
44+
45+
const gcloudGPGPath = await tc.downloadTool('https://packages.cloud.google.com/apt/doc/apt-key.gpg');
46+
await io.mv(gcloudGPGPath, path.join(homeDirectory, "key.gpg"));
3847
await exec.exec(`sudo apt-key add ${homeDirectory}/key.gpg`);
48+
//download gcloud-sdk
3949
await exec.exec('bash -c "sudo apt-get update && sudo apt-get install -qqy google-cloud-sdk "');
4050
await exec.exec(`bash -c "gcloud config set core/disable_usage_reporting true && gcloud config set component_manager/disable_update_check true "`);
4151

52+
//download android sdk
53+
await io.mkdirP(`${homeDirectory}/android/sdk`);
54+
4255
core.exportVariable('ANDROID_HOME',`${homeDirectory}/android/sdk`);
4356
core.exportVariable('SDK_VERSION','sdk-tools-linux-4333796.zip');
4457
core.exportVariable('ADB_INSTALL_TIMEOUT','120');
58+
59+
//await exec.exec(`bash -c "curl --silent --show-error --location --fail --retry 3 --output ${homeDirectory}/$SDK_VERSION https://dl.google.com/android/repository/$SDK_VERSION"`);
60+
//await exec.exec(`bash -c "sudo unzip -q ${homeDirectory}/$SDK_VERSION -d $ANDROID_HOME && sudo rm -rf ${homeDirectory}/$SDK_VERSION "`);
61+
const androidSDKPath = await tc.downloadTool('https://dl.google.com/android/repository/$SDK_VERSION');
62+
await tc.extractZip(androidSDKPath, '$ANDROID_HOME');
4563

46-
await io.mkdirP(`${homeDirectory}/android/sdk`);
47-
await exec.exec(`bash -c "curl --silent --show-error --location --fail --retry 3 --output ${homeDirectory}/$SDK_VERSION https://dl.google.com/android/repository/$SDK_VERSION"`);
48-
await exec.exec(`bash -c "sudo unzip -q ${homeDirectory}/$SDK_VERSION -d $ANDROID_HOME && sudo rm -rf ${homeDirectory}/$SDK_VERSION "`);
4964

50-
core.addPath(`${homeDirectory}/android/sdk/tools`);
51-
core.addPath(`${homeDirectory}/android/sdk/tools/bin`);
52-
core.addPath(`${homeDirectory}/android/sdk/platform-tools`);
65+
core.addPath('$ANDROID_HOME/tools');
66+
core.addPath('$ANDROID_HOME/tools/bin');
67+
core.addPath('$ANDROID_HOME/platform-tools');
5368

5469
await exec.exec(`bash -c "echo $PATH" `);
5570
await exec.exec(`bash -c "echo $ANDROID_HOME" `);
71+
5672
console.log('=== installing android SDK ===');
5773

58-
await io.mkdirP(`${homeDirectory}/.android`);
59-
await exec.exec(`bash -c "sudo echo '### User Sources for Android SDK Manager' | sudo tee -a ${homeDirectory}/.android/repositories.cfg"`);
60-
await exec.exec(`bash -c "yes | sudo ${homeDirectory}/android/sdk/tools/bin/sdkmanager --licenses"`);
61-
await exec.exec(`sudo chown -R ${user}:${user} ${homeDirectory}/android`);
62-
await exec.exec(`sudo chown -R ${user}:${user} ${homeDirectory}/.android`);
63-
await exec.exec(`bash -c " ls -la ${homeDirectory}/android/sdk/tools/"`)
64-
await exec.exec(`bash -c "sudo ${homeDirectory}/android/sdk/tools/bin/sdkmanager "tools" "platform-tools" "`);
65-
await exec.exec(`bash -c "sudo ${homeDirectory}/android/sdk/tools/bin/sdkmanager "build-tools;${version}.0.0" "`);
66-
await exec.exec(`bash -c "sudo ${homeDirectory}/android/sdk/tools/bin/sdkmanager "platforms;android-${version}" "`);
67-
await exec.exec(`bash -c "sudo ${homeDirectory}/android/sdk/tools/bin/sdkmanager --update "`)
74+
// await io.mkdirP(`${homeDirectory}/.android`);
75+
// await exec.exec(`bash -c "sudo echo '### User Sources for Android SDK Manager' | sudo tee -a ${homeDirectory}/.android/repositories.cfg"`);
76+
await exec.exec(`bash -c "mkdir ~/.android && echo '### User Sources for Android SDK Manager' > ~/.android/repositories.cfg"`);
77+
await exec.exec(`bash -c "sudo ln -s $ANDROID_HOME/tools/bin/sdkmanager /usr/lib/sdkmanager"`);
78+
await exec.exec(`bash -c "yes | sudo sdkmanager --list"`);
79+
await exec.exec(`bash -c "yes | sudo sdkmanager --licenses"`);
80+
// await exec.exec(`sudo chown -R ${user}:${user} ${homeDirectory}/android`);
81+
// await exec.exec(`sudo chown -R ${user}:${user} ${homeDirectory}/.android`);
82+
// await exec.exec(`bash -c " ls -la ${homeDirectory}/android/sdk/tools/"`);
83+
// await exec.exec(`bash -c "sdkmanager --list"`);
84+
// await exec.exec(`bash -c "sudo ${homeDirectory}/android/sdk/tools/bin/sdkmanager "tools" "platform-tools" "`);
85+
// await exec.exec(`bash -c "sudo ${homeDirectory}/android/sdk/tools/bin/sdkmanager "build-tools;${version}.0.0" "`);
86+
// await exec.exec(`bash -c "sudo ${homeDirectory}/android/sdk/tools/bin/sdkmanager "platforms;android-${version}" "`);
87+
// await exec.exec(`bash -c "sudo ${homeDirectory}/android/sdk/tools/bin/sdkmanager --update "`)
6888
}

0 commit comments

Comments
 (0)