From b69593376d4c33b67437ce9af6e9b38e6a912b8d Mon Sep 17 00:00:00 2001 From: Tim Felgentreff Date: Mon, 21 Aug 2023 10:58:30 +0200 Subject: [PATCH] fix macos names for graalpy --- dist/setup/index.js | 8 ++++++-- src/install-graalpy.ts | 11 ++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index af5cc8993..8dd9b59d7 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -69735,10 +69735,14 @@ function findAsset(item, architecture, platform) { : architecture === 'arm64' ? 'aarch64' : architecture; - const graalpyPlatform = platform == 'win32' ? 'windows' : platform; + const graalpyPlatform = platform === 'win32' + ? 'windows' + : platform === 'darwin' + ? 'macos' + : platform; if (item.assets) { return item.assets.find((file) => { - const match_data = file.name.match('.*(darwin|linux|windows)-(amd64|aarch64).tar.gz$'); + const match_data = file.name.match('.*(macos|linux|windows)-(amd64|aarch64).tar.gz$'); return (match_data && match_data[1] === graalpyPlatform && match_data[2] === graalpyArch); diff --git a/src/install-graalpy.ts b/src/install-graalpy.ts index 608bcf0a3..5494305fa 100644 --- a/src/install-graalpy.ts +++ b/src/install-graalpy.ts @@ -233,11 +233,16 @@ export function findAsset( : architecture === 'arm64' ? 'aarch64' : architecture; - const graalpyPlatform = platform == 'win32' ? 'windows' : platform; - if (item.assets) { + const graalpyPlatform = + platform === 'win32' + ? 'windows' + : platform === 'darwin' + ? 'macos' + : platform; + if (item.assets) { return item.assets.find((file: IGraalPyManifestAsset) => { const match_data = file.name.match( - '.*(darwin|linux|windows)-(amd64|aarch64).tar.gz$' + '.*(macos|linux|windows)-(amd64|aarch64).tar.gz$' ); return ( match_data &&