diff --git a/lib/run.js b/lib/run.js index b351e33..8cd1a6d 100644 --- a/lib/run.js +++ b/lib/run.js @@ -118,21 +118,24 @@ function getLatestHelmVersionFor(type) { } }); const releases = repository.releases.nodes.reverse(); - releases.forEach(release => { - if (isValidVersion(release.tagName, type)) - return release.tagName; - }); + core.debug(releases); + let latestValidRelease = releases.find(release => isValidVersion(release.tagName, type)); + if (latestValidRelease) + return latestValidRelease.tagName; } catch (err) { - core.warning(util.format("Error while fetching the latest Helm %s release. Error: %s. Using defaul Helm version %s.", type, err.toString(), stableHelmVersion)); + core.warning(util.format("Error while fetching the latest Helm %s release. Error: %s. Using default Helm version %s.", type, err.toString(), stableHelmVersion)); } + core.warning(util.format("Could not find stable release for Helm %s. Using default Helm version %s.", type, stableHelmVersion)); return stableHelmVersion; }); } // isValidVersion checks if verison matches the specified type and is a stable release function isValidVersion(version, type) { - if (!version.startsWith(type)) + console.log(version.toLocaleLowerCase().startsWith(type)); + if (!version.toLocaleLowerCase().startsWith(type)) return false; + core.debug("version: " + version + " type: " + type); return version.indexOf('rc') == -1; } function findHelm(rootFolder) { diff --git a/src/run.ts b/src/run.ts index 6a63943..0587676 100644 --- a/src/run.ts +++ b/src/run.ts @@ -97,22 +97,25 @@ async function getLatestHelmVersionFor(type) { } } ); + const releases = repository.releases.nodes.reverse(); - releases.forEach(release => { - if (isValidVersion(release.tagName, type)) - return release.tagName; - }); + core.debug(releases); + let latestValidRelease = releases.find(release => isValidVersion(release.tagName, type)); + if(latestValidRelease) + return latestValidRelease.tagName; } catch (err) { - core.warning(util.format("Error while fetching the latest Helm %s release. Error: %s. Using defaul Helm version %s.", type, err.toString(), stableHelmVersion)); + core.warning(util.format("Error while fetching the latest Helm %s release. Error: %s. Using default Helm version %s.", type, err.toString(), stableHelmVersion)); } - core.warning(util.format("Could not find stable release for Helm %s. Using defaul Helm version %s.", type, stableHelmVersion)); + core.warning(util.format("Could not find stable release for Helm %s. Using default Helm version %s.", type, stableHelmVersion)); return stableHelmVersion; } // isValidVersion checks if verison matches the specified type and is a stable release function isValidVersion(version, type): boolean { - if (!version.startsWith(type)) + console.log(version.toLocaleLowerCase().startsWith(type)) + if (!version.toLocaleLowerCase().startsWith(type)) return false; + core.debug("version: "+version+" type: "+type); return version.indexOf('rc') == -1 }