format, lint and build

This commit is contained in:
Tim Felgentreff 2023-06-30 18:12:19 +02:00
parent f40a022aaf
commit 6db14b26fd
6 changed files with 387 additions and 92 deletions

View file

@ -1,10 +1,6 @@
import * as path from 'path';
import * as graalpyInstall from './install-graalpy';
import {
IS_WINDOWS,
validateVersion,
IGraalPyManifestRelease
} from './utils';
import {IS_WINDOWS, validateVersion, IGraalPyManifestRelease} from './utils';
import * as semver from 'semver';
import * as core from '@actions/core';
@ -34,9 +30,7 @@ export async function findGraalPyVersion(
);
if (releaseData) {
core.info(
`Resolved as GraalPy ${releaseData.resolvedGraalPyVersion}`
);
core.info(`Resolved as GraalPy ${releaseData.resolvedGraalPyVersion}`);
graalpyVersionSpec = releaseData.resolvedGraalPyVersion;
} else {
core.info(
@ -52,13 +46,12 @@ export async function findGraalPyVersion(
));
if (!installDir) {
({installDir, resolvedGraalPyVersion} =
await graalpyInstall.installGraalPy(
graalpyVersionSpec,
architecture,
allowPreReleases,
releases
));
({installDir, resolvedGraalPyVersion} = await graalpyInstall.installGraalPy(
graalpyVersionSpec,
architecture,
allowPreReleases,
releases
));
}
const pipDir = IS_WINDOWS ? 'Scripts' : 'bin';
@ -92,7 +85,11 @@ export function findGraalPyToolCache(
architecture: string
) {
let resolvedGraalPyVersion = '';
let installDir: string | null = tc.find('GraalPy', graalpyVersion, architecture);
let installDir: string | null = tc.find(
'GraalPy',
graalpyVersion,
architecture
);
if (installDir) {
// 'tc.find' finds tool based on Python version but we also need to check

View file

@ -11,7 +11,7 @@ import {
IS_WINDOWS,
IGraalPyManifestAsset,
IGraalPyManifestRelease,
isNightlyKeyword,
isNightlyKeyword
} from './utils';
export async function installGraalPy(
@ -28,12 +28,7 @@ export async function installGraalPy(
throw new Error('No release was found in GraalPy version.json');
}
let releaseData = findRelease(
releases,
graalpyVersion,
architecture,
false
);
let releaseData = findRelease(releases, graalpyVersion, architecture, false);
if (allowPreReleases && (!releaseData || !releaseData.foundAsset)) {
// check for pre-release
@ -43,12 +38,7 @@ export async function installGraalPy(
`Trying pre-release versions`
].join(os.EOL)
);
releaseData = findRelease(
releases,
graalpyVersion,
architecture,
true
);
releaseData = findRelease(releases, graalpyVersion, architecture, true);
}
if (!releaseData || !releaseData.foundAsset) {
@ -157,7 +147,9 @@ export function findRelease(
graalpyVersion,
options
);
return isVersionSatisfied && !!findAsset(item, architecture, process.platform);
return (
isVersionSatisfied && !!findAsset(item, architecture, process.platform)
);
});
if (filterReleases.length === 0) {
@ -200,15 +192,24 @@ export function findAsset(
architecture: string,
platform: string
) {
const graalpyArch = architecture === 'x64' ? 'amd64' : (architecture === 'arm64' ? 'aarch64' : architecture);
const graalpyPlatform = platform == "win32" ? "windows" : platform;
const graalpyArch =
architecture === 'x64'
? 'amd64'
: architecture === 'arm64'
? 'aarch64'
: architecture;
const graalpyPlatform = platform == 'win32' ? 'windows' : platform;
if (item.assets) {
return item.assets.find(
(file: IGraalPyManifestAsset) => {
const match_data = file.name.match(".*(darwin|linux|windows)-(amd64|aarch64).tar.gz$");
return match_data && match_data[1] === graalpyPlatform && match_data[2] === graalpyArch;
}
);
return item.assets.find((file: IGraalPyManifestAsset) => {
const match_data = file.name.match(
'.*(darwin|linux|windows)-(amd64|aarch64).tar.gz$'
);
return (
match_data &&
match_data[1] === graalpyPlatform &&
match_data[2] === graalpyArch
);
});
} else {
return undefined;
}

View file

@ -120,9 +120,7 @@ async function run() {
allowPreReleases
);
pythonVersion = `${installed}`;
core.info(
`Successfully set up GraalPy ${installed}`
);
core.info(`Successfully set up GraalPy ${installed}`);
} else {
if (version.startsWith('2')) {
core.warning(