Changing order

This commit is contained in:
Shivam Gupta
2021-03-17 12:19:23 +05:30
parent b32bc6e2d6
commit e7eef55398
2 changed files with 104 additions and 102 deletions

View File

@ -144,6 +144,7 @@ function getLatestHelmVersionFor(type) {
} }
`); `);
console.log(versions); console.log(versions);
return stableHelmVersion;
}); });
} }
function findHelm(rootFolder) { function findHelm(rootFolder) {
@ -163,15 +164,15 @@ function run() {
if (version.toLocaleLowerCase() === 'latest') { if (version.toLocaleLowerCase() === 'latest') {
version = yield getStableHelmVersion(); version = yield getStableHelmVersion();
} }
else if (!version.toLocaleLowerCase().startsWith('v')) {
version = 'v' + version;
}
else if (version === LATEST_HELM2_VERSION) { else if (version === LATEST_HELM2_VERSION) {
version = 'v' + getLatestHelmVersionFor(2); version = 'v' + getLatestHelmVersionFor(2);
} }
else if (version === LATEST_HELM3_VERSION) { else if (version === LATEST_HELM3_VERSION) {
version = 'v' + getLatestHelmVersionFor(3); version = 'v' + getLatestHelmVersionFor(3);
} }
else if (!version.toLocaleLowerCase().startsWith('v')) {
version = 'v' + version;
}
let cachedPath = yield downloadHelm(version); let cachedPath = yield downloadHelm(version);
try { try {
if (!process.env['PATH'].startsWith(path.dirname(cachedPath))) { if (!process.env['PATH'].startsWith(path.dirname(cachedPath))) {

View File

@ -123,6 +123,7 @@ async function getLatestHelmVersionFor(type) {
` `
); );
console.log(versions); console.log(versions);
return stableHelmVersion;
} }
function findHelm(rootFolder: string): string { function findHelm(rootFolder: string): string {
@ -141,12 +142,12 @@ async function run() {
let version = core.getInput('version', { 'required': true }); let version = core.getInput('version', { 'required': true });
if (version.toLocaleLowerCase() === 'latest') { if (version.toLocaleLowerCase() === 'latest') {
version = await getStableHelmVersion(); version = await getStableHelmVersion();
} else if (!version.toLocaleLowerCase().startsWith('v')) {
version = 'v' + version;
} else if (version === LATEST_HELM2_VERSION) { } else if (version === LATEST_HELM2_VERSION) {
version = 'v' + getLatestHelmVersionFor(2); version = 'v' + getLatestHelmVersionFor(2);
} else if (version === LATEST_HELM3_VERSION) { } else if (version === LATEST_HELM3_VERSION) {
version = 'v' + getLatestHelmVersionFor(3); version = 'v' + getLatestHelmVersionFor(3);
} else if (!version.toLocaleLowerCase().startsWith('v')) {
version = 'v' + version;
} }
let cachedPath = await downloadHelm(version); let cachedPath = await downloadHelm(version);