actions-mirror/setup-php
1
0
Fork 0
mirror of https://github.com/shivammathur/setup-php.git synced 2026-09-20 10:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Preserve PowerShell return values in verbose mode

Browse Source
This commit is contained in:
Shivam Mathur
2026-09-12 00:32:55 +05:30
parent 2ec764e0ab
commit 3ad6232c89
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
__tests__/utils.test.ts
+12 -4
View File
@@ -458,7 +458,9 @@ describe.each(['linux', 'darwin', 'win32'])(
const prepared = await utils.addVerbose(run, platform); const prepared = await utils.addVerbose(run, platform);
const script = fs.readFileSync(prepared, 'utf8'); const script = fs.readFileSync(prepared, 'utf8');
expect(prepared !== run).toBe(enabled); expect(prepared !== run).toBe(enabled);
expect(script.includes('2>&1')).toBe(!enabled); expect(
script.includes(platform === 'win32' ? '>$null' : '>/dev/null')
).toBe(!enabled);
expect(script.includes('src-verbose')).toBe(enabled); expect(script.includes('src-verbose')).toBe(enabled);
expect(script.startsWith('. ')).toBe(true); expect(script.startsWith('. ')).toBe(true);
expect(process.env.SETUP_PHP_TRACE).toBe( expect(process.env.SETUP_PHP_TRACE).toBe(
@@ -501,7 +503,9 @@ describe.each(['linux', 'darwin', 'win32'])(
path.join(path.dirname(prepared), 'tools', path.basename(helper)), path.join(path.dirname(prepared), 'tools', path.basename(helper)),
'utf8' 'utf8'
) )
).toBe(`echo nested-output \n${probe}\n`); ).toBe(
`echo nested-output ${platform === 'win32' ? '2>&1 | Out-Host' : ''}\n${probe}\n`
);
expect(fs.readFileSync(helper, 'utf8')).toContain(pipe); expect(fs.readFileSync(helper, 'utf8')).toContain(pipe);
const shell = platform === 'win32' ? 'pwsh' : 'bash'; const shell = platform === 'win32' ? 'pwsh' : 'bash';
if (platform === 'win32' ? hasPwsh : process.platform !== 'win32') { if (platform === 'win32' ? hasPwsh : process.platform !== 'win32') {
@@ -529,7 +533,9 @@ describe.each(['linux', 'darwin', 'win32'])(
if (verbose !== undefined) process.env.verbose = verbose; if (verbose !== undefined) process.env.verbose = verbose;
const prepared = await utils.addVerbose(run, platform); const prepared = await utils.addVerbose(run, platform);
expect(prepared).not.toBe(run); expect(prepared).not.toBe(run);
expect(fs.readFileSync(prepared, 'utf8')).not.toContain('2>&1'); expect(fs.readFileSync(prepared, 'utf8')).not.toMatch(
/>\s*(?:\/dev\/null|\$null)\s+2>&1/
);
expect(process.env.SETUP_PHP_TRACE).toBe( expect(process.env.SETUP_PHP_TRACE).toBe(
/^v{2,3}$/.test(verbose || '') ? String(verbose!.length - 1) : '0' /^v{2,3}$/.test(verbose || '') ? String(verbose!.length - 1) : '0'
); );
@@ -826,7 +832,9 @@ echo should-not-run
path.join(path.dirname(first), 'tools', path.basename(helper)), path.join(path.dirname(first), 'tools', path.basename(helper)),
'utf8' 'utf8'
) )
).toBe('echo original \n'); ).toBe(
`echo original ${platform === 'win32' ? '2>&1 | Out-Host' : ''}\n`
);
} }
); );
} }
dist/index.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
src/utils.ts
+5 -1
View File
@@ -360,7 +360,11 @@ export async function addVerbose(
if (!file.endsWith(extension)) continue; if (!file.endsWith(extension)) continue;
const filename = path.join(scripts, file); const filename = path.join(scripts, file);
const original = fs.readFileSync(filename, 'utf8'); const original = fs.readFileSync(filename, 'utf8');
let script = original.replace(pipe, ''); // PowerShell's success stream also carries function return values.
let script = original.replace(
pipe,
os === 'win32' ? '2>&1 | Out-Host' : ''
);
if (filename === verbose_run) { if (filename === verbose_run) {
script = script.replaceAll(src, dest); script = script.replaceAll(src, dest);
} }