From 5162a5672996150cbf981f310efe52c25f77ba32 Mon Sep 17 00:00:00 2001 From: Evgenii Korolevskii Date: Thu, 24 Nov 2022 18:23:19 +0100 Subject: [PATCH] retry logic --- dist/setup/index.js | 15 +++++++++++++-- src/setup-java.ts | 15 +++++++++++++-- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 6fd0065c..af5bcc0b 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -105076,8 +105076,16 @@ function run() { yield installVersion(stringVersion); } catch (error) { - core.info(`${stringVersion} not found`); - throw new Error("some err"); + core.debug(`${error.toString()}`); + try { + const majorMinorVersion = getHigherVersion(stringVersion); + yield installVersion(majorMinorVersion); + } + catch (error) { + core.debug(`${error.toString()}`); + const majorVersion = getHigherVersion(stringVersion); + yield installVersion(majorVersion); + } } } for (const [index, version] of versions.entries()) { @@ -105112,6 +105120,9 @@ function run() { core.info(''); }); } + function getHigherVersion(version) { + return version.substring(0, version.lastIndexOf(".")); + } } catch (error) { core.setFailed(error.message); diff --git a/src/setup-java.ts b/src/setup-java.ts index f829a6fd..9fd9a048 100644 --- a/src/setup-java.ts +++ b/src/setup-java.ts @@ -42,8 +42,15 @@ async function run() { try { await installVersion(stringVersion) } catch (error) { - core.info(`${stringVersion} not found`) - throw new Error("some err") + core.debug(`${error.toString()}`) + try { + const majorMinorVersion = getHigherVersion(stringVersion) + await installVersion(majorMinorVersion) + } catch (error) { + core.debug(`${error.toString()}`) + const majorVersion = getHigherVersion(stringVersion) + await installVersion(majorVersion) + } } } @@ -87,6 +94,10 @@ async function run() { core.info(` Path: ${result.path}`); core.info(''); } + + function getHigherVersion(version: string) { + return version.substring(0, version.lastIndexOf(".")) + } } catch (error) { core.setFailed(error.message); }