From 4c8e4456e2cf2bdd0aa571961ce288a965f2eb22 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Thu, 27 Apr 2023 17:49:37 +0200 Subject: [PATCH] setup: warning non-cached tool: github/action-runners ships only one tool version Removed message about policy that several versions of GHC and cabal are shipped---not true any longer. Updated links to point to current upstream action-runners repo. --- setup/dist/index.js | 16 +++++----------- setup/lib/installer.js | 16 +++++----------- setup/src/installer.ts | 17 +++++------------ 3 files changed, 15 insertions(+), 34 deletions(-) diff --git a/setup/dist/index.js b/setup/dist/index.js index 7288466a..b7e9f80e 100644 --- a/setup/dist/index.js +++ b/setup/dist/index.js @@ -13342,21 +13342,15 @@ async function success(tool, version, path, os) { return true; } function warn(tool, version) { - const policy = { - cabal: `the two latest major releases of ${tool} are commonly supported.`, - ghc: `the three latest major releases of ${tool} are commonly supported.`, - stack: `the latest release of ${tool} is commonly supported.` - }[tool]; core.debug(`${tool} ${version} was not found in the cache. It will be downloaded.\n` + `If this is unexpected, please check if version ${version} is pre-installed.\n` + - `The list of pre-installed versions is available here: https://help.github.com/en/actions/reference/software-installed-on-github-hosted-runners\n` + - `The above list follows a common haskell convention that ${policy}\n` + - 'If the list is outdated, please file an issue here: https://github.com/actions/virtual-environments\n' + - 'by using the appropriate tool request template: https://github.com/actions/virtual-environments/issues/new/choose'); + `The list of pre-installed versions is available from here: https://github.com/actions/runner-images#available-images\n` + + 'If the list is outdated, please file an issue here: https://github.com/actions/runner-images/issues\n' + + 'by using the appropriate tool request template: https://github.com/actions/runner-images/issues/new/choose'); } function aptVersion(tool, version) { - // For Cabal, extract the first two segments of the version number. This - // regex is intentionally liberal to accomodate unusual cases like "head". + // For Cabal, extract the first two segments of the version number. + // This regex is intentionally liberal to accommodate unusual cases like "head". return tool === 'cabal' ? /[^.]*\.?[^.]*/.exec(version)[0] : version; } async function isInstalled(tool, version, os) { diff --git a/setup/lib/installer.js b/setup/lib/installer.js index b1af2fdf..d8877327 100644 --- a/setup/lib/installer.js +++ b/setup/lib/installer.js @@ -61,21 +61,15 @@ async function success(tool, version, path, os) { return true; } function warn(tool, version) { - const policy = { - cabal: `the two latest major releases of ${tool} are commonly supported.`, - ghc: `the three latest major releases of ${tool} are commonly supported.`, - stack: `the latest release of ${tool} is commonly supported.` - }[tool]; core.debug(`${tool} ${version} was not found in the cache. It will be downloaded.\n` + `If this is unexpected, please check if version ${version} is pre-installed.\n` + - `The list of pre-installed versions is available here: https://help.github.com/en/actions/reference/software-installed-on-github-hosted-runners\n` + - `The above list follows a common haskell convention that ${policy}\n` + - 'If the list is outdated, please file an issue here: https://github.com/actions/virtual-environments\n' + - 'by using the appropriate tool request template: https://github.com/actions/virtual-environments/issues/new/choose'); + `The list of pre-installed versions is available from here: https://github.com/actions/runner-images#available-images\n` + + 'If the list is outdated, please file an issue here: https://github.com/actions/runner-images/issues\n' + + 'by using the appropriate tool request template: https://github.com/actions/runner-images/issues/new/choose'); } function aptVersion(tool, version) { - // For Cabal, extract the first two segments of the version number. This - // regex is intentionally liberal to accomodate unusual cases like "head". + // For Cabal, extract the first two segments of the version number. + // This regex is intentionally liberal to accommodate unusual cases like "head". return tool === 'cabal' ? /[^.]*\.?[^.]*/.exec(version)[0] : version; } async function isInstalled(tool, version, os) { diff --git a/setup/src/installer.ts b/setup/src/installer.ts index fbca1ecd..b3b68961 100644 --- a/setup/src/installer.ts +++ b/setup/src/installer.ts @@ -49,25 +49,18 @@ async function success( } function warn(tool: Tool, version: string): void { - const policy = { - cabal: `the two latest major releases of ${tool} are commonly supported.`, - ghc: `the three latest major releases of ${tool} are commonly supported.`, - stack: `the latest release of ${tool} is commonly supported.` - }[tool]; - core.debug( `${tool} ${version} was not found in the cache. It will be downloaded.\n` + `If this is unexpected, please check if version ${version} is pre-installed.\n` + - `The list of pre-installed versions is available here: https://help.github.com/en/actions/reference/software-installed-on-github-hosted-runners\n` + - `The above list follows a common haskell convention that ${policy}\n` + - 'If the list is outdated, please file an issue here: https://github.com/actions/virtual-environments\n' + - 'by using the appropriate tool request template: https://github.com/actions/virtual-environments/issues/new/choose' + `The list of pre-installed versions is available from here: https://github.com/actions/runner-images#available-images\n` + + 'If the list is outdated, please file an issue here: https://github.com/actions/runner-images/issues\n' + + 'by using the appropriate tool request template: https://github.com/actions/runner-images/issues/new/choose' ); } function aptVersion(tool: string, version: string): string { - // For Cabal, extract the first two segments of the version number. This - // regex is intentionally liberal to accomodate unusual cases like "head". + // For Cabal, extract the first two segments of the version number. + // This regex is intentionally liberal to accommodate unusual cases like "head". return tool === 'cabal' ? /[^.]*\.?[^.]*/.exec(version)![0] : version; }