From e2c02857f141cc8f6a7e8d61726782ee55bad0d1 Mon Sep 17 00:00:00 2001 From: Evgenii Korolevskii Date: Thu, 24 Nov 2022 19:24:01 +0100 Subject: [PATCH] remove unused import --- dist/setup/index.js | 15 ++++++++++----- src/setup-java.ts | 37 ++++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index cfeb24d2..57b72a34 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -105184,13 +105184,16 @@ function run() { toolchainIds = []; } if (!versions.length) { - core.debug("JAVA_VERSION input is empty, looking for .java-version file"); + core.debug('JAVA_VERSION input is empty, looking for .java-version file'); const versionFileName = '.java-version'; - const contents = fs_1.default.readFileSync(versionFileName).toString().trim(); + const contents = fs_1.default + .readFileSync(versionFileName) + .toString() + .trim(); const semverRegExp = /(\d+\.\d+\.\d+.*ea.*$|\d+\.\d+\.\d+\+\d*$|\d+\.\d+\.\d+|\d+\.\d+|\d+\-ea$|\d+$)/; - let version = semverRegExp.test(contents) ? RegExp.$1 : ""; + let version = semverRegExp.test(contents) ? RegExp.$1 : ''; let installed = false; - while (!installed && version != "") { + while (!installed && version != '') { try { core.debug(`Trying to install version ${version}`); yield installVersion(version); @@ -105238,7 +105241,9 @@ function run() { }); } function getHigherVersion(version) { - return version.split("-")[0] === version ? version.substring(0, version.lastIndexOf(".")) : version.split("-")[0]; + return version.split('-')[0] === version + ? version.substring(0, version.lastIndexOf('.')) + : version.split('-')[0]; } } catch (error) { diff --git a/src/setup-java.ts b/src/setup-java.ts index 8e1ef206..4164806e 100644 --- a/src/setup-java.ts +++ b/src/setup-java.ts @@ -1,4 +1,4 @@ -import fs from "fs"; +import fs from 'fs'; import * as core from '@actions/core'; import * as auth from './auth'; import { getBooleanInput, isCacheFeatureAvailable } from './util'; @@ -8,7 +8,6 @@ import { restore } from './cache'; import * as path from 'path'; import { getJavaDistribution } from './distributions/distribution-factory'; import { JavaInstallerOptions } from './distributions/base-models'; -import * as semver from 'semver'; async function run() { try { @@ -28,29 +27,32 @@ async function run() { } if (!versions.length) { - core.debug("JAVA_VERSION input is empty, looking for .java-version file") - const versionFileName = '.java-version' - const contents = fs.readFileSync(versionFileName).toString().trim(); - const semverRegExp = /(\d+\.\d+\.\d+.*ea.*$|\d+\.\d+\.\d+\+\d*$|\d+\.\d+\.\d+|\d+\.\d+|\d+\-ea$|\d+$)/ - let version = semverRegExp.test(contents) ? RegExp.$1 : ""; + core.debug('JAVA_VERSION input is empty, looking for .java-version file'); + const versionFileName = '.java-version'; + const contents = fs + .readFileSync(versionFileName) + .toString() + .trim(); + const semverRegExp = /(\d+\.\d+\.\d+.*ea.*$|\d+\.\d+\.\d+\+\d*$|\d+\.\d+\.\d+|\d+\.\d+|\d+\-ea$|\d+$)/; + let version = semverRegExp.test(contents) ? RegExp.$1 : ''; let installed = false; - while (!installed && version != "") { + while (!installed && version != '') { try { - core.debug(`Trying to install version ${version}`) - await installVersion(version) - installed = true + core.debug(`Trying to install version ${version}`); + await installVersion(version); + installed = true; } catch (error) { core.debug(`${error.toString()}`); - version = getHigherVersion(version) + version = getHigherVersion(version); } } if (!installed) { - throw new Error("Сan't install appropriate version from .java-version file") + throw new Error("Сan't install appropriate version from .java-version file"); } } for (const [index, version] of versions.entries()) { - await installVersion(version, index) + await installVersion(version, index); } core.endGroup(); const matchersPath = path.join(__dirname, '..', '..', '.github'); @@ -61,7 +63,7 @@ async function run() { await restore(cache); } - async function installVersion(version:string, toolchainId = 0 ) { + async function installVersion(version: string, toolchainId = 0) { const installerOptions: JavaInstallerOptions = { architecture, packageType, @@ -91,9 +93,10 @@ async function run() { } function getHigherVersion(version: string) { - return version.split("-")[0] === version ? version.substring(0, version.lastIndexOf(".")) : version.split("-")[0] + return version.split('-')[0] === version + ? version.substring(0, version.lastIndexOf('.')) + : version.split('-')[0]; } - } catch (error) { core.setFailed(error.message); }