fix version output

This commit is contained in:
Frost Ming 2021-04-06 09:13:28 +08:00
parent 51a3c26cfe
commit b756184efa
No known key found for this signature in database
GPG Key ID: 5BFA9CB4DDA943BF
2 changed files with 4 additions and 4 deletions

4
dist/setup-pdm.js vendored
View File

@ -6183,11 +6183,11 @@ async function run() {
installedPython = await findPythonVersion(core3.getInput("python-version"), arch2); installedPython = await findPythonVersion(core3.getInput("python-version"), arch2);
} }
await exec3.exec("pdm", ["use", "-f", installedPython.version]); await exec3.exec("pdm", ["use", "-f", installedPython.version]);
const pdmVersionOutput = (await (0, import_child_process.exec)("pdm --version")).stdout?.read(); const pdmVersionOutput = (await (0, import_child_process.exec)("pdm --version")).stdout;
if (process.platform === "linux") { if (process.platform === "linux") {
core3.exportVariable("LD_PRELOAD", "/lib/x86_64-linux-gnu/libgcc_s.so.1"); core3.exportVariable("LD_PRELOAD", "/lib/x86_64-linux-gnu/libgcc_s.so.1");
} }
core3.info(`Successfully setup ${pdmVersionOutput} with Python ${installedPython.version}`); core3.info(`Successfully setup ${pdmVersionOutput && pdmVersionOutput.read()} with Python ${installedPython.version}`);
const matchersPath = import_path.default.join(__dirname, "..", ".github"); const matchersPath = import_path.default.join(__dirname, "..", ".github");
core3.info(`##[add-matcher]${import_path.default.join(matchersPath, "python.json")}`); core3.info(`##[add-matcher]${import_path.default.join(matchersPath, "python.json")}`);
} catch (error2) { } catch (error2) {

View File

@ -25,13 +25,13 @@ async function run(): Promise<void> {
); );
} }
await exec.exec("pdm", ["use", "-f", installedPython.version]); await exec.exec("pdm", ["use", "-f", installedPython.version]);
const pdmVersionOutput = (await execChild("pdm --version")).stdout?.read(); const pdmVersionOutput = (await execChild("pdm --version")).stdout;
if (process.platform === 'linux') { if (process.platform === 'linux') {
// See https://github.com/actions/virtual-environments/issues/2803 // See https://github.com/actions/virtual-environments/issues/2803
core.exportVariable('LD_PRELOAD', '/lib/x86_64-linux-gnu/libgcc_s.so.1'); core.exportVariable('LD_PRELOAD', '/lib/x86_64-linux-gnu/libgcc_s.so.1');
} }
core.info( core.info(
`Successfully setup ${pdmVersionOutput} with Python ${installedPython.version}` `Successfully setup ${pdmVersionOutput && pdmVersionOutput.read()} with Python ${installedPython.version}`
); );
const matchersPath = path.join(__dirname, '..', '.github'); const matchersPath = path.join(__dirname, '..', '.github');
core.info(`##[add-matcher]${path.join(matchersPath, 'python.json')}`); core.info(`##[add-matcher]${path.join(matchersPath, 'python.json')}`);