Fix side effects of this action

This commit is contained in:
Shivam Mathur 2019-10-27 05:42:49 +05:30
parent 16267e1982
commit 0d8d5d2f2c
No known key found for this signature in database
GPG Key ID: 3E13E4C8591ACC2A
26 changed files with 162 additions and 180 deletions

View File

@ -24,7 +24,7 @@ describe('Config tests', () => {
true true
); );
expect(linux).toContain( expect(linux).toContain(
'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata" >> $ini_file' 'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"'
); );
linux = await config.addINIValues( linux = await config.addINIValues(
@ -40,7 +40,7 @@ describe('Config tests', () => {
'darwin' 'darwin'
); );
expect(darwin).toContain( expect(darwin).toContain(
'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata" >> $ini_file' 'echo "post_max_size=256M\nshort_open_tag=On\ndate.timezone=Asia/Kolkata"'
); );
darwin = await config.addINIValues( darwin = await config.addINIValues(

View File

@ -47,16 +47,16 @@ describe('Extension tests', () => {
); );
linux = await extensions.addExtension('xdebug, pcov', '7.4', 'linux'); linux = await extensions.addExtension('xdebug, pcov', '7.4', 'linux');
expect(linux).toContain('./xdebug.sh'); expect(linux).toContain('xdebug.sh');
expect(linux).toContain('./pcov.sh'); expect(linux).toContain('pcov.sh');
linux = await extensions.addExtension('phalcon3, phalcon4', '7.2', 'linux'); linux = await extensions.addExtension('phalcon3, phalcon4', '7.2', 'linux');
expect(linux).toContain('./phalcon.sh master 7.2'); expect(linux).toContain('phalcon.sh master 7.2');
expect(linux).toContain('./phalcon.sh 4.0.x 7.2'); expect(linux).toContain('phalcon.sh 4.0.x 7.2');
linux = await extensions.addExtension('phalcon3, phalcon4', '7.3', 'linux'); linux = await extensions.addExtension('phalcon3, phalcon4', '7.3', 'linux');
expect(linux).toContain('./phalcon.sh master 7.3'); expect(linux).toContain('phalcon.sh master 7.3');
expect(linux).toContain('./phalcon.sh 4.0.x 7.3'); expect(linux).toContain('phalcon.sh 4.0.x 7.3');
linux = await extensions.addExtension('xdebug', '7.2', 'fedora'); linux = await extensions.addExtension('xdebug', '7.2', 'fedora');
expect(linux).toContain('Platform fedora is not supported'); expect(linux).toContain('Platform fedora is not supported');
@ -81,10 +81,10 @@ describe('Extension tests', () => {
expect(darwin).toContain('sudo pecl install xdebug-2.5.5'); expect(darwin).toContain('sudo pecl install xdebug-2.5.5');
darwin = await extensions.addExtension('xdebug', '7.4', 'darwin'); darwin = await extensions.addExtension('xdebug', '7.4', 'darwin');
expect(darwin).toContain('sh ./xdebug_darwin.sh'); expect(darwin).toContain('xdebug_darwin.sh');
darwin = await extensions.addExtension('pcov', '7.4', 'darwin'); darwin = await extensions.addExtension('pcov', '7.4', 'darwin');
expect(darwin).toContain('sh ./pcov.sh'); expect(darwin).toContain('pcov.sh');
darwin = await extensions.addExtension('xdebug', '7.2', 'darwin'); darwin = await extensions.addExtension('xdebug', '7.2', 'darwin');
expect(darwin).toContain('sudo pecl install xdebug'); expect(darwin).toContain('sudo pecl install xdebug');

View File

@ -61,23 +61,17 @@ describe('Utils tests', () => {
expect(await utils.readScript('fedora.sh', '7.3', 'fedora')).toContain( expect(await utils.readScript('fedora.sh', '7.3', 'fedora')).toContain(
'Platform fedora is not supported' 'Platform fedora is not supported'
); );
await cleanup('./config.yaml');
await cleanup('./pcov.sh');
await cleanup('./phalcon.sh');
await cleanup('./php_pcov.dll');
await cleanup('./xdebug_darwin.sh');
}); });
it('checking writeScripts', async () => { it('checking writeScripts', async () => {
let testString: string = 'sudo apt-get install php'; let testString: string = 'sudo apt-get install php';
await utils.writeScript('test.sh', '10', testString); let runner_dir: string = process.env['RUNNER_TOOL_CACHE'] || '';
await fs.readFile(path.join(__dirname, '../10test.sh'), function( let script_path: string = path.join(runner_dir, 'test.sh');
error: any, await utils.writeScript('test.sh', testString);
data: Buffer await fs.readFile(script_path, function(error: any, data: Buffer) {
) {
expect(testString).toBe(data.toString()); expect(testString).toBe(data.toString());
}); });
await cleanup('./10test.sh'); await cleanup(script_path);
}); });
it('checking extensionArray', async () => { it('checking extensionArray', async () => {

View File

@ -16,6 +16,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
return result; return result;
}; };
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
const path = __importStar(require("path"));
const utils = __importStar(require("./utils")); const utils = __importStar(require("./utils"));
/** /**
* Install and enable extensions * Install and enable extensions
@ -70,11 +71,15 @@ function addExtensionDarwin(extension_csv, version) {
switch (version + extension) { switch (version + extension) {
case '7.4xdebug': case '7.4xdebug':
install_command = install_command =
'sh ./xdebug_darwin.sh >/dev/null 2>&1 && echo "zend_extension=xdebug.so" >> $ini_file'; 'sh ' +
path.join(__dirname, '../src/scripts/xdebug_darwin.sh') +
' >/dev/null 2>&1 && echo "zend_extension=xdebug.so" >> $ini_file';
break; break;
case '7.4pcov': case '7.4pcov':
install_command = install_command =
'sh ./pcov.sh >/dev/null 2>&1 && echo "extension=pcov.so" >> $ini_file'; 'sh ' +
path.join(__dirname, '../src/scripts/pcov.sh') +
' >/dev/null 2>&1 && echo "extension=pcov.so" >> $ini_file';
break; break;
case '5.6xdebug': case '5.6xdebug':
install_command = 'sudo pecl install xdebug-2.5.5 >/dev/null 2>&1'; install_command = 'sudo pecl install xdebug-2.5.5 >/dev/null 2>&1';
@ -156,19 +161,34 @@ function addExtensionLinux(extension_csv, version) {
switch (version + extension) { switch (version + extension) {
case '7.4xdebug': case '7.4xdebug':
install_command = install_command =
'./xdebug.sh >/dev/null 2>&1 && echo "zend_extension=xdebug.so" >> $ini_file'; 'sh ' +
path.join(__dirname, '../src/scripts/xdebug.sh') +
' >/dev/null 2>&1 && echo "zend_extension=xdebug.so" >> $ini_file';
break; break;
case '7.4pcov': case '7.4pcov':
install_command = install_command =
'./pcov.sh >/dev/null 2>&1 && echo "extension=pcov.so" >> $ini_file'; 'sh ' +
path.join(__dirname, '../src/scripts/pcov.sh') +
' >/dev/null 2>&1 && echo "extension=pcov.so" >> $ini_file';
break; break;
case '7.2phalcon3': case '7.2phalcon3':
case '7.3phalcon3': case '7.3phalcon3':
install_command = './phalcon.sh master ' + version + ' >/dev/null 2>&1'; install_command =
'sh ' +
path.join(__dirname, '../src/scripts/phalcon.sh') +
' master ' +
version +
' >/dev/null 2>&1';
break; break;
case '7.2phalcon4': case '7.2phalcon4':
case '7.3phalcon4': case '7.3phalcon4':
install_command = './phalcon.sh 4.0.x ' + version + ' >/dev/null 2>&1'; case '7.4phalcon4':
install_command =
'sh ' +
path.join(__dirname, '../src/scripts/phalcon.sh') +
' 4.0.x ' +
version +
' >/dev/null 2>&1';
break; break;
default: default:
install_command = install_command =

View File

@ -18,10 +18,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
const exec_1 = require("@actions/exec/lib/exec"); const exec_1 = require("@actions/exec/lib/exec");
const core = __importStar(require("@actions/core")); const core = __importStar(require("@actions/core"));
const utils = __importStar(require("./utils"));
const extensions = __importStar(require("./extensions"));
const config = __importStar(require("./config")); const config = __importStar(require("./config"));
const coverage = __importStar(require("./coverage")); const coverage = __importStar(require("./coverage"));
const extensions = __importStar(require("./extensions"));
const utils = __importStar(require("./utils"));
/** /**
* Build the script * Build the script
* *
@ -45,7 +45,7 @@ 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);
} }
yield utils.writeScript(filename, version, script); return yield utils.writeScript(filename, script);
}); });
} }
/** /**
@ -58,16 +58,16 @@ function run() {
let version = yield utils.getInput('php-version', true); let version = yield utils.getInput('php-version', true);
// check the os version and run the respective script // check the os version and run the respective script
if (os_version == 'darwin') { if (os_version == 'darwin') {
yield build('darwin.sh', version, os_version); let script_path = yield build('darwin.sh', version, os_version);
yield exec_1.exec('sh ./' + version + 'darwin.sh ' + version); yield exec_1.exec('sh ' + script_path + ' ' + version + ' ' + __dirname);
} }
else if (os_version == 'win32') { else if (os_version == 'win32') {
yield build('win32.ps1', version, os_version); let script_path = yield build('win32.ps1', version, os_version);
yield exec_1.exec('pwsh .\\' + version + 'win32.ps1 -version ' + version); yield exec_1.exec('pwsh ' + script_path + ' -version ' + version + ' -dir ' + __dirname);
} }
else if (os_version == 'linux') { else if (os_version == 'linux') {
yield build('linux.sh', version, os_version); let script_path = yield build('linux.sh', version, os_version);
yield exec_1.exec('./' + version + 'linux.sh ' + version); yield exec_1.exec('sh ' + script_path + ' ' + version + ' ' + __dirname);
} }
} }
catch (error) { catch (error) {

View File

@ -53,19 +53,6 @@ function asyncForEach(array, callback) {
}); });
} }
exports.asyncForEach = asyncForEach; exports.asyncForEach = asyncForEach;
/**
* Copy config
*
* @param files
*/
function moveFiles(files) {
return __awaiter(this, void 0, void 0, function* () {
yield asyncForEach(files, function (filename) {
fs.createReadStream(path.join(__dirname, '../src/' + filename)).pipe(fs.createWriteStream(filename.split('/')[1], { mode: 0o755 }));
});
});
}
exports.moveFiles = moveFiles;
/** /**
* Read the scripts * Read the scripts
* *
@ -79,34 +66,15 @@ function readScript(filename, version, os_version) {
case 'darwin': case 'darwin':
switch (version) { switch (version) {
case '7.4': case '7.4':
yield moveFiles([
'configs/config.yaml',
'scripts/xdebug_darwin.sh',
'scripts/pcov.sh'
]);
return fs.readFileSync(path.join(__dirname, '../src/scripts/7.4.sh'), 'utf8'); return fs.readFileSync(path.join(__dirname, '../src/scripts/7.4.sh'), 'utf8');
} }
break; return fs.readFileSync(path.join(__dirname, '../src/scripts/' + filename), 'utf8');
case 'linux': case 'linux':
let files = ['scripts/phalcon.sh'];
switch (version) {
case '7.4':
files = files.concat(['scripts/xdebug.sh', 'scripts/pcov.sh']);
break;
}
yield moveFiles(files);
break;
case 'win32': case 'win32':
switch (version) { return fs.readFileSync(path.join(__dirname, '../src/scripts/' + filename), 'utf8');
case '7.4':
yield moveFiles(['ext/php_pcov.dll']);
break;
}
break;
default: default:
return yield log('Platform ' + os_version + ' is not supported', os_version, 'error'); return yield log('Platform ' + os_version + ' is not supported', os_version, 'error');
} }
return fs.readFileSync(path.join(__dirname, '../src/scripts/' + filename), 'utf8');
}); });
} }
exports.readScript = readScript; exports.readScript = readScript;
@ -117,9 +85,12 @@ exports.readScript = readScript;
* @param version * @param version
* @param script * @param script
*/ */
function writeScript(filename, version, script) { function writeScript(filename, script) {
return __awaiter(this, void 0, void 0, function* () { return __awaiter(this, void 0, void 0, function* () {
fs.writeFileSync(version + filename, script, { mode: 0o755 }); let runner_dir = yield getInput('RUNNER_TOOL_CACHE', false);
let script_path = path.join(runner_dir, filename);
fs.writeFileSync(script_path, script, { mode: 0o755 });
return script_path;
}); });
} }
exports.writeScript = writeScript; exports.writeScript = writeScript;

View File

@ -2,7 +2,7 @@
"_args": [ "_args": [
[ [
"@actions/core@1.2.0", "@actions/core@1.2.0",
"E:\\python\\setup-php" "C:\\wamp64\\www\\setup-php"
] ]
], ],
"_from": "@actions/core@1.2.0", "_from": "@actions/core@1.2.0",
@ -28,7 +28,7 @@
], ],
"_resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.0.tgz", "_resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.0.tgz",
"_spec": "1.2.0", "_spec": "1.2.0",
"_where": "E:\\python\\setup-php", "_where": "C:\\wamp64\\www\\setup-php",
"bugs": { "bugs": {
"url": "https://github.com/actions/toolkit/issues" "url": "https://github.com/actions/toolkit/issues"
}, },

View File

@ -2,7 +2,7 @@
"_args": [ "_args": [
[ [
"@actions/exec@1.0.1", "@actions/exec@1.0.1",
"E:\\python\\setup-php" "C:\\wamp64\\www\\setup-php"
] ]
], ],
"_from": "@actions/exec@1.0.1", "_from": "@actions/exec@1.0.1",
@ -27,7 +27,7 @@
], ],
"_resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.0.1.tgz", "_resolved": "https://registry.npmjs.org/@actions/exec/-/exec-1.0.1.tgz",
"_spec": "1.0.1", "_spec": "1.0.1",
"_where": "E:\\python\\setup-php", "_where": "C:\\wamp64\\www\\setup-php",
"bugs": { "bugs": {
"url": "https://github.com/actions/toolkit/issues" "url": "https://github.com/actions/toolkit/issues"
}, },

View File

@ -2,7 +2,7 @@
"_args": [ "_args": [
[ [
"@actions/io@1.0.1", "@actions/io@1.0.1",
"E:\\python\\setup-php" "C:\\wamp64\\www\\setup-php"
] ]
], ],
"_from": "@actions/io@1.0.1", "_from": "@actions/io@1.0.1",
@ -27,7 +27,7 @@
], ],
"_resolved": "https://registry.npmjs.org/@actions/io/-/io-1.0.1.tgz", "_resolved": "https://registry.npmjs.org/@actions/io/-/io-1.0.1.tgz",
"_spec": "1.0.1", "_spec": "1.0.1",
"_where": "E:\\python\\setup-php", "_where": "C:\\wamp64\\www\\setup-php",
"bugs": { "bugs": {
"url": "https://github.com/actions/toolkit/issues" "url": "https://github.com/actions/toolkit/issues"
}, },

View File

@ -2,7 +2,7 @@
"_args": [ "_args": [
[ [
"@actions/tool-cache@1.1.2", "@actions/tool-cache@1.1.2",
"E:\\python\\setup-php" "C:\\wamp64\\www\\setup-php"
] ]
], ],
"_from": "@actions/tool-cache@1.1.2", "_from": "@actions/tool-cache@1.1.2",
@ -27,7 +27,7 @@
], ],
"_resolved": "https://registry.npmjs.org/@actions/tool-cache/-/tool-cache-1.1.2.tgz", "_resolved": "https://registry.npmjs.org/@actions/tool-cache/-/tool-cache-1.1.2.tgz",
"_spec": "1.1.2", "_spec": "1.1.2",
"_where": "E:\\python\\setup-php", "_where": "C:\\wamp64\\www\\setup-php",
"bugs": { "bugs": {
"url": "https://github.com/actions/toolkit/issues" "url": "https://github.com/actions/toolkit/issues"
}, },

4
node_modules/fs/package.json generated vendored
View File

@ -2,7 +2,7 @@
"_args": [ "_args": [
[ [
"fs@0.0.1-security", "fs@0.0.1-security",
"E:\\python\\setup-php" "C:\\wamp64\\www\\setup-php"
] ]
], ],
"_from": "fs@0.0.1-security", "_from": "fs@0.0.1-security",
@ -26,7 +26,7 @@
], ],
"_resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz", "_resolved": "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz",
"_spec": "0.0.1-security", "_spec": "0.0.1-security",
"_where": "E:\\python\\setup-php", "_where": "C:\\wamp64\\www\\setup-php",
"author": "", "author": "",
"bugs": { "bugs": {
"url": "https://github.com/npm/security-holder/issues" "url": "https://github.com/npm/security-holder/issues"

4
node_modules/semver/package.json generated vendored
View File

@ -2,7 +2,7 @@
"_args": [ "_args": [
[ [
"semver@6.3.0", "semver@6.3.0",
"E:\\python\\setup-php" "C:\\wamp64\\www\\setup-php"
] ]
], ],
"_from": "semver@6.3.0", "_from": "semver@6.3.0",
@ -28,7 +28,7 @@
], ],
"_resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "_resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
"_spec": "6.3.0", "_spec": "6.3.0",
"_where": "E:\\python\\setup-php", "_where": "C:\\wamp64\\www\\setup-php",
"bin": { "bin": {
"semver": "./bin/semver.js" "semver": "./bin/semver.js"
}, },

4
node_modules/tunnel/package.json generated vendored
View File

@ -2,7 +2,7 @@
"_args": [ "_args": [
[ [
"tunnel@0.0.4", "tunnel@0.0.4",
"E:\\python\\setup-php" "C:\\wamp64\\www\\setup-php"
] ]
], ],
"_from": "tunnel@0.0.4", "_from": "tunnel@0.0.4",
@ -26,7 +26,7 @@
], ],
"_resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz", "_resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz",
"_spec": "0.0.4", "_spec": "0.0.4",
"_where": "E:\\python\\setup-php", "_where": "C:\\wamp64\\www\\setup-php",
"author": { "author": {
"name": "Koichi Kobayashi", "name": "Koichi Kobayashi",
"email": "koichik@improvement.jp" "email": "koichik@improvement.jp"

View File

@ -2,7 +2,7 @@
"_args": [ "_args": [
[ [
"typed-rest-client@1.5.0", "typed-rest-client@1.5.0",
"E:\\python\\setup-php" "C:\\wamp64\\www\\setup-php"
] ]
], ],
"_from": "typed-rest-client@1.5.0", "_from": "typed-rest-client@1.5.0",
@ -26,7 +26,7 @@
], ],
"_resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.5.0.tgz", "_resolved": "https://registry.npmjs.org/typed-rest-client/-/typed-rest-client-1.5.0.tgz",
"_spec": "1.5.0", "_spec": "1.5.0",
"_where": "E:\\python\\setup-php", "_where": "C:\\wamp64\\www\\setup-php",
"author": { "author": {
"name": "Microsoft Corporation" "name": "Microsoft Corporation"
}, },

View File

@ -2,7 +2,7 @@
"_args": [ "_args": [
[ [
"underscore@1.8.3", "underscore@1.8.3",
"E:\\python\\setup-php" "C:\\wamp64\\www\\setup-php"
] ]
], ],
"_from": "underscore@1.8.3", "_from": "underscore@1.8.3",
@ -26,7 +26,7 @@
], ],
"_resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", "_resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
"_spec": "1.8.3", "_spec": "1.8.3",
"_where": "E:\\python\\setup-php", "_where": "C:\\wamp64\\www\\setup-php",
"author": { "author": {
"name": "Jeremy Ashkenas", "name": "Jeremy Ashkenas",
"email": "jeremy@documentcloud.org" "email": "jeremy@documentcloud.org"

4
node_modules/uuid/package.json generated vendored
View File

@ -2,7 +2,7 @@
"_args": [ "_args": [
[ [
"uuid@3.3.3", "uuid@3.3.3",
"E:\\python\\setup-php" "C:\\wamp64\\www\\setup-php"
] ]
], ],
"_from": "uuid@3.3.3", "_from": "uuid@3.3.3",
@ -27,7 +27,7 @@
], ],
"_resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", "_resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
"_spec": "3.3.3", "_spec": "3.3.3",
"_where": "E:\\python\\setup-php", "_where": "C:\\wamp64\\www\\setup-php",
"bin": { "bin": {
"uuid": "./bin/uuid" "uuid": "./bin/uuid"
}, },

View File

@ -1,3 +1,4 @@
import * as path from 'path';
import * as utils from './utils'; import * as utils from './utils';
/** /**
@ -62,11 +63,15 @@ export async function addExtensionDarwin(
switch (version + extension) { switch (version + extension) {
case '7.4xdebug': case '7.4xdebug':
install_command = install_command =
'sh ./xdebug_darwin.sh >/dev/null 2>&1 && echo "zend_extension=xdebug.so" >> $ini_file'; 'sh ' +
path.join(__dirname, '../src/scripts/xdebug_darwin.sh') +
' >/dev/null 2>&1 && echo "zend_extension=xdebug.so" >> $ini_file';
break; break;
case '7.4pcov': case '7.4pcov':
install_command = install_command =
'sh ./pcov.sh >/dev/null 2>&1 && echo "extension=pcov.so" >> $ini_file'; 'sh ' +
path.join(__dirname, '../src/scripts/pcov.sh') +
' >/dev/null 2>&1 && echo "extension=pcov.so" >> $ini_file';
break; break;
case '5.6xdebug': case '5.6xdebug':
install_command = 'sudo pecl install xdebug-2.5.5 >/dev/null 2>&1'; install_command = 'sudo pecl install xdebug-2.5.5 >/dev/null 2>&1';
@ -149,19 +154,34 @@ export async function addExtensionLinux(
switch (version + extension) { switch (version + extension) {
case '7.4xdebug': case '7.4xdebug':
install_command = install_command =
'./xdebug.sh >/dev/null 2>&1 && echo "zend_extension=xdebug.so" >> $ini_file'; 'sh ' +
path.join(__dirname, '../src/scripts/xdebug.sh') +
' >/dev/null 2>&1 && echo "zend_extension=xdebug.so" >> $ini_file';
break; break;
case '7.4pcov': case '7.4pcov':
install_command = install_command =
'./pcov.sh >/dev/null 2>&1 && echo "extension=pcov.so" >> $ini_file'; 'sh ' +
path.join(__dirname, '../src/scripts/pcov.sh') +
' >/dev/null 2>&1 && echo "extension=pcov.so" >> $ini_file';
break; break;
case '7.2phalcon3': case '7.2phalcon3':
case '7.3phalcon3': case '7.3phalcon3':
install_command = './phalcon.sh master ' + version + ' >/dev/null 2>&1'; install_command =
'sh ' +
path.join(__dirname, '../src/scripts/phalcon.sh') +
' master ' +
version +
' >/dev/null 2>&1';
break; break;
case '7.2phalcon4': case '7.2phalcon4':
case '7.3phalcon4': case '7.3phalcon4':
install_command = './phalcon.sh 4.0.x ' + version + ' >/dev/null 2>&1'; case '7.4phalcon4':
install_command =
'sh ' +
path.join(__dirname, '../src/scripts/phalcon.sh') +
' 4.0.x ' +
version +
' >/dev/null 2>&1';
break; break;
default: default:
install_command = install_command =

View File

@ -1,9 +1,10 @@
import {exec} from '@actions/exec/lib/exec'; import {exec} from '@actions/exec/lib/exec';
import * as core from '@actions/core'; import * as core from '@actions/core';
import * as utils from './utils'; import * as path from 'path';
import * as extensions from './extensions';
import * as config from './config'; import * as config from './config';
import * as coverage from './coverage'; import * as coverage from './coverage';
import * as extensions from './extensions';
import * as utils from './utils';
/** /**
* Build the script * Build the script
@ -12,7 +13,11 @@ import * as coverage from './coverage';
* @param version * @param version
* @param os_version * @param os_version
*/ */
async function build(filename: string, version: string, os_version: string) { async function build(
filename: string,
version: string,
os_version: string
): Promise<string> {
// taking inputs // taking inputs
let extension_csv: string = await utils.getInput('extension-csv', false); let extension_csv: string = await utils.getInput('extension-csv', false);
let ini_values_csv: string = await utils.getInput('ini-values-csv', false); let ini_values_csv: string = await utils.getInput('ini-values-csv', false);
@ -28,7 +33,8 @@ async function build(filename: string, version: string, os_version: string) {
if (coverage_driver) { if (coverage_driver) {
script += await coverage.addCoverage(coverage_driver, version, os_version); script += await coverage.addCoverage(coverage_driver, version, os_version);
} }
await utils.writeScript(filename, version, script);
return await utils.writeScript(filename, script);
} }
/** /**
@ -40,14 +46,16 @@ async function run() {
let version: string = await utils.getInput('php-version', true); let version: string = await utils.getInput('php-version', true);
// check the os version and run the respective script // check the os version and run the respective script
if (os_version == 'darwin') { if (os_version == 'darwin') {
await build('darwin.sh', version, os_version); let script_path: string = await build('darwin.sh', version, os_version);
await exec('sh ./' + version + 'darwin.sh ' + version); await exec('sh ' + script_path + ' ' + version + ' ' + __dirname);
} else if (os_version == 'win32') { } else if (os_version == 'win32') {
await build('win32.ps1', version, os_version); let script_path: string = await build('win32.ps1', version, os_version);
await exec('pwsh .\\' + version + 'win32.ps1 -version ' + version); await exec(
'pwsh ' + script_path + ' -version ' + version + ' -dir ' + __dirname
);
} else if (os_version == 'linux') { } else if (os_version == 'linux') {
await build('linux.sh', version, os_version); let script_path: string = await build('linux.sh', version, os_version);
await exec('./' + version + 'linux.sh ' + version); await exec('sh ' + script_path + ' ' + version + ' ' + __dirname);
} }
} catch (error) { } catch (error) {
core.setFailed(error.message); core.setFailed(error.message);

View File

@ -58,7 +58,7 @@ echo 'export EXTRA_LIBS="/usr/local/opt/readline/lib/libhistory.dylib
/usr/local/opt/icu4c/lib/libicutu.dylib /usr/local/opt/icu4c/lib/libicutu.dylib
/usr/local/opt/icu4c/lib/libicuuc.dylib"' /usr/local/opt/icu4c/lib/libicuuc.dylib"'
} >> ~/.bash_profile } >> ~/.bash_profile
config_file=$(pwd)/config.yaml config_file=$2/../src/configs/config.yaml
step_log "Setup PHPBrew" step_log "Setup PHPBrew"
curl -L -O https://github.com/phpbrew/phpbrew/raw/master/phpbrew >/dev/null 2>&1 curl -L -O https://github.com/phpbrew/phpbrew/raw/master/phpbrew >/dev/null 2>&1

View File

@ -34,7 +34,7 @@ if [ "$existing_version" != "$1" ]; then
for tool in php phar phar.phar php-cgi php-config phpize; do for tool in php phar phar.phar php-cgi php-config phpize; do
if [ -e "/usr/bin/$tool$1" ]; then if [ -e "/usr/bin/$tool$1" ]; then
sudo update-alternatives --set $tool /usr/bin/"$tool$1" >/dev/null 2>&1 & sudo update-alternatives --set $tool /usr/bin/"$tool$1" >/dev/null 2>&1
fi fi
done done
fi fi

View File

@ -1,7 +1,5 @@
git clone --depth=1 https://github.com/krakjoe/pcov.git cd ~ && git clone --depth=1 https://github.com/krakjoe/pcov.git
(
cd pcov && phpize cd pcov && phpize
./configure --enable-pcov ./configure --enable-pcov
make make
sudo make install sudo make install
)

View File

@ -1,19 +1,21 @@
ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g") ini_file=$(php --ini | grep "Loaded Configuration" | sed -e "s|.*:s*||" | sed "s/ //g")
sudo DEBIAN_FRONTEND=noninteractive apt install php"$2"-dev php-pear -y sudo DEBIAN_FRONTEND=noninteractive apt install php"$2"-dev -y
for tool in php-config phpize; do for tool in php-config phpize; do
if [ -e "/usr/bin/$tool$2" ]; then if [ -e "/usr/bin/$tool$2" ]; then
sudo update-alternatives --set $tool /usr/bin/"$tool$2" & sudo update-alternatives --set $tool /usr/bin/"$tool$2"
fi fi
done done
sudo pecl config-set php_ini "$ini_file"
sudo pear config-set php_ini "$ini_file" cd ~ && git clone --depth=1 https://github.com/jbboehr/php-psr.git
sudo pecl install psr cd php-psr && sudo /usr/bin/phpize"$2"
./configure --with-php-config=/usr/bin/php-config"$2"
make -j2 && sudo make -j2 install
echo "extension=psr.so" >> "$ini_file"
if [ "$1" = "master" ]; then if [ "$1" = "master" ]; then
sudo DEBIAN_FRONTEND=noninteractive apt install php"$2"-phalcon -y sudo DEBIAN_FRONTEND=noninteractive apt install php"$2"-phalcon -y
else else
git clone --depth=1 -v https://github.com/phalcon/cphalcon.git -b "$1" cd ~ && git clone --depth=1 -v https://github.com/phalcon/cphalcon.git -b "$1"
( cd cphalcon/build && sudo ./install --phpize /usr/bin/phpize"$2" --php-config /usr/bin/php-config"$2"
cd cphalcon/build && sudo ./install --phpize /usr/bin/phpize"$2" --php-config /usr/bin/php-config"$2" echo "extension=phalcon.so" >> "$ini_file"
echo "extension=phalcon.so" >> "$ini_file"
)
fi fi

View File

@ -1,5 +1,6 @@
param ( param (
[Parameter(Mandatory=$true)][string]$version = "7.3" [Parameter(Mandatory=$true)][string]$version = "7.3",
[Parameter(Mandatory=$true)][string]$dir
) )
$tick = ([char]8730) $tick = ([char]8730)
@ -41,7 +42,7 @@ if($version -lt '7.4') {
Enable-PhpExtension curl Enable-PhpExtension curl
} else { } else {
Add-Content C:\tools\php\php.ini "extension=php_openssl.dll`nextension=php_curl.dll" Add-Content C:\tools\php\php.ini "extension=php_openssl.dll`nextension=php_curl.dll"
Copy-Item "php_pcov.dll" -Destination $ext_dir"\php_pcov.dll" Copy-Item $dir"\..\src\ext\php_pcov.dll" -Destination $ext_dir"\php_pcov.dll"
} }
Add-Log $tick "PHP" $status Add-Log $tick "PHP" $status

View File

@ -1,5 +1,3 @@
git clone --depth=1 https://github.com/xdebug/xdebug.git cd ~ && git clone --depth=1 https://github.com/xdebug/xdebug.git
( cd xdebug || echo "Failed to clone Xdebug"
cd xdebug || echo "cd failed" sudo ./rebuild.sh
sudo ./rebuild.sh
)

View File

@ -1,8 +1,6 @@
git clone --depth=1 https://github.com/xdebug/xdebug.git cd ~ && git clone --depth=1 https://github.com/xdebug/xdebug.git
( cd xdebug || echo "Failed to clone Xdebug"
cd xdebug || echo "cd failed" sudo phpize
sudo phpize sudo ./configure
sudo ./configure sudo make
sudo make sudo cp modules/xdebug.so "$(php -i | grep "extension_dir => /opt" | sed -e "s|.*=> s*||")"
sudo cp modules/xdebug.so "$(php -i | grep "extension_dir => /opt" | sed -e "s|.*=> s*||")"
)

View File

@ -38,19 +38,6 @@ export async function asyncForEach(
} }
} }
/**
* Copy config
*
* @param files
*/
export async function moveFiles(files: Array<string>) {
await asyncForEach(files, function(filename: string) {
fs.createReadStream(path.join(__dirname, '../src/' + filename)).pipe(
fs.createWriteStream(filename.split('/')[1], {mode: 0o755})
);
});
}
/** /**
* Read the scripts * Read the scripts
* *
@ -67,33 +54,21 @@ export async function readScript(
case 'darwin': case 'darwin':
switch (version) { switch (version) {
case '7.4': case '7.4':
await moveFiles([
'configs/config.yaml',
'scripts/xdebug_darwin.sh',
'scripts/pcov.sh'
]);
return fs.readFileSync( return fs.readFileSync(
path.join(__dirname, '../src/scripts/7.4.sh'), path.join(__dirname, '../src/scripts/7.4.sh'),
'utf8' 'utf8'
); );
} }
break; return fs.readFileSync(
path.join(__dirname, '../src/scripts/' + filename),
'utf8'
);
case 'linux': case 'linux':
let files: Array<string> = ['scripts/phalcon.sh'];
switch (version) {
case '7.4':
files = files.concat(['scripts/xdebug.sh', 'scripts/pcov.sh']);
break;
}
await moveFiles(files);
break;
case 'win32': case 'win32':
switch (version) { return fs.readFileSync(
case '7.4': path.join(__dirname, '../src/scripts/' + filename),
await moveFiles(['ext/php_pcov.dll']); 'utf8'
break; );
}
break;
default: default:
return await log( return await log(
'Platform ' + os_version + ' is not supported', 'Platform ' + os_version + ' is not supported',
@ -101,11 +76,6 @@ export async function readScript(
'error' 'error'
); );
} }
return fs.readFileSync(
path.join(__dirname, '../src/scripts/' + filename),
'utf8'
);
} }
/** /**
@ -117,10 +87,12 @@ export async function readScript(
*/ */
export async function writeScript( export async function writeScript(
filename: string, filename: string,
version: string,
script: string script: string
): Promise<any> { ): Promise<string> {
fs.writeFileSync(version + filename, script, {mode: 0o755}); let runner_dir: string = await getInput('RUNNER_TOOL_CACHE', false);
let script_path: string = path.join(runner_dir, filename);
fs.writeFileSync(script_path, script, {mode: 0o755});
return script_path;
} }
/** /**