actions/setup-php
1
0
Fork 0
mirror of https://github.com/shivammathur/setup-php.git synced 2024-11-22 20:01:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix setup order

Browse Source
This commit is contained in:
Shivam Mathur 2020-01-01 16:05:01 +05:30
parent 6c6203b683
commit 0ac6f76d36
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
__tests__/install.test.ts
View File

@ -20,6 +20,9 @@ jest.mock('../src/install', () => ({
} }
let script = 'initial script ' + filename + version + os_version; let script = 'initial script ' + filename + version + os_version;
if (tools_csv) {
script += 'add_tool';
}
if (extension_csv) { if (extension_csv) {
script += 'install extensions'; script += 'install extensions';
} }
@ -29,9 +32,6 @@ jest.mock('../src/install', () => ({
if (coverage_driver) { if (coverage_driver) {
script += 'set coverage driver'; script += 'set coverage driver';
} }
if (tools_csv) {
script += 'add_tool';
}
return script; return script;
} }

2
dist/index.js vendored
View File

@ -2042,6 +2042,7 @@ function build(filename, version, os_version) {
tools_csv = 'pecl, ' + tools_csv; tools_csv = 'pecl, ' + tools_csv;
} }
let script = yield utils.readScript(filename, version, os_version); let script = yield utils.readScript(filename, version, os_version);
script += yield tools.addTools(tools_csv, os_version);
if (extension_csv) { if (extension_csv) {
script += yield extensions.addExtension(extension_csv, version, os_version); script += yield extensions.addExtension(extension_csv, version, os_version);
} }
@ -2051,7 +2052,6 @@ function build(filename, version, os_version) {
if (coverage_driver) { if (coverage_driver) {
script += yield coverage.addCoverage(coverage_driver, version, os_version); script += yield coverage.addCoverage(coverage_driver, version, os_version);
} }
script += yield tools.addTools(tools_csv, os_version);
return yield utils.writeScript(filename, script); return yield utils.writeScript(filename, script);
}); });
} }

3
src/install.ts
View File

@ -34,6 +34,8 @@ export async function build(
} }
let script: string = await utils.readScript(filename, version, os_version); let script: string = await utils.readScript(filename, version, os_version);
script += await tools.addTools(tools_csv, os_version);
if (extension_csv) { if (extension_csv) {
script += await extensions.addExtension(extension_csv, version, os_version); script += await extensions.addExtension(extension_csv, version, os_version);
} }
@ -43,7 +45,6 @@ export async function build(
if (coverage_driver) { if (coverage_driver) {
script += await coverage.addCoverage(coverage_driver, version, os_version); script += await coverage.addCoverage(coverage_driver, version, os_version);
} }
script += await tools.addTools(tools_csv, os_version);
return await utils.writeScript(filename, script); return await utils.writeScript(filename, script);
} }