From 22678cd5c8042310e6070bbcb40e503340dedb72 Mon Sep 17 00:00:00 2001 From: IvanZosimov Date: Tue, 31 May 2022 16:44:00 +0200 Subject: [PATCH] Change find-pypy.ts to redefine pythonLocaction environment variable --- dist/setup/index.js | 2 +- src/find-pypy.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dist/setup/index.js b/dist/setup/index.js index 60ad858..2eefa24 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -63993,7 +63993,7 @@ function findPyPyVersion(versionSpec, architecture) { const binaryExtension = utils_1.IS_WINDOWS ? '.exe' : ''; const pythonPath = path.join(utils_1.IS_WINDOWS ? installDir : _binDir, `python${binaryExtension}`); const pythonLocation = pypyInstall.getPyPyBinaryPath(installDir); - core.exportVariable('pythonLocation', pythonLocation); + core.exportVariable('pythonLocation', installDir); core.exportVariable('PKG_CONFIG_PATH', pythonLocation + '/lib/pkgconfig'); core.addPath(pythonLocation); core.addPath(_binDir); diff --git a/src/find-pypy.ts b/src/find-pypy.ts index 1008ed6..630d685 100644 --- a/src/find-pypy.ts +++ b/src/find-pypy.ts @@ -54,7 +54,7 @@ export async function findPyPyVersion( `python${binaryExtension}` ); const pythonLocation = pypyInstall.getPyPyBinaryPath(installDir); - core.exportVariable('pythonLocation', pythonLocation); + core.exportVariable('pythonLocation', installDir); core.exportVariable('PKG_CONFIG_PATH', pythonLocation + '/lib/pkgconfig'); core.addPath(pythonLocation); core.addPath(_binDir);