setup-php 2.23.0 → 2.24.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -3
- package/lib/coverage.js +11 -7
- package/lib/coverage.js.map +1 -1
- package/lib/extensions.js +5 -0
- package/lib/extensions.js.map +1 -1
- package/lib/tools.js +8 -4
- package/lib/tools.js.map +1 -1
- package/lib/utils.js +6 -1
- package/lib/utils.js.map +1 -1
- package/package.json +15 -15
- package/src/coverage.ts +12 -16
- package/src/extensions.ts +16 -0
- package/src/scripts/extensions/add_extensions.ps1 +17 -0
- package/src/scripts/extensions/firebird.ps1 +1 -1
- package/src/scripts/extensions/http.ps1 +1 -6
- package/src/scripts/extensions/relay.sh +143 -0
- package/src/scripts/extensions/source.sh +1 -1
- package/src/scripts/extensions/zephir_parser.ps1 +79 -0
- package/src/scripts/extensions/zephir_parser.sh +37 -0
- package/src/scripts/linux.sh +1 -1
- package/src/scripts/tools/add_tools.ps1 +3 -3
- package/src/scripts/tools/add_tools.sh +3 -3
- package/src/scripts/tools/grpc_php_plugin.ps1 +1 -1
- package/src/tools.ts +7 -6
- package/src/utils.ts +8 -1
package/README.md
CHANGED
|
@@ -207,8 +207,8 @@ PHP extensions can be set up using the `extensions` input. It accepts a `string`
|
|
|
207
207
|
|
|
208
208
|
- These extensions have custom support:
|
|
209
209
|
- `cubrid` and `pdo_cubrid` on `Ubuntu`.
|
|
210
|
-
- `gearman`, `geos` and `
|
|
211
|
-
- `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_firebird`, `pdo_oci`, `pecl_http`, `phalcon3`, `phalcon4` and `
|
|
210
|
+
- `event`, `gearman`, `geos` and `relay` on `Ubuntu` and `macOS`.
|
|
211
|
+
- `blackfire`, `couchbase`, `ioncube`, `oci8`, `pdo_firebird`, `pdo_oci`, `pecl_http`, `phalcon3`, `phalcon4`, `phalcon5`, and `zephir_parser` on all supported OS.
|
|
212
212
|
|
|
213
213
|
- By default, extensions which cannot be added or disabled gracefully leave an error message in the logs, the execution is not interrupted. To change this behaviour you can set `fail-fast` flag to `true`.
|
|
214
214
|
|
|
@@ -736,7 +736,7 @@ If your project uses composer, you can persist the composer's internal cache dir
|
|
|
736
736
|
run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
|
|
737
737
|
|
|
738
738
|
- name: Cache dependencies
|
|
739
|
-
uses: actions/cache@
|
|
739
|
+
uses: actions/cache@v3
|
|
740
740
|
with:
|
|
741
741
|
path: ${{ steps.composer-cache.outputs.dir }}
|
|
742
742
|
key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
|
package/lib/coverage.js
CHANGED
|
@@ -37,19 +37,21 @@ async function checkXdebugError(extension, version) {
|
|
|
37
37
|
exports.checkXdebugError = checkXdebugError;
|
|
38
38
|
async function addCoverageXdebug(extension, version, os, pipe) {
|
|
39
39
|
let script = '\n';
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
if (!message) {
|
|
40
|
+
const error = await checkXdebugError(extension, version);
|
|
41
|
+
if (!error) {
|
|
43
42
|
script +=
|
|
44
43
|
(await extensions.addExtension(':pcov:false', version, os, true)) + pipe;
|
|
45
44
|
extension = extension == 'xdebug3' ? 'xdebug' : extension;
|
|
46
45
|
script +=
|
|
47
46
|
(await extensions.addExtension(extension, version, os, true)) + pipe;
|
|
48
47
|
script += await utils.setVariable('xdebug_version', 'php -r "echo phpversion(\'xdebug\');"', os);
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
script +=
|
|
49
|
+
(await utils.getCommand(os, 'extension_log')) +
|
|
50
|
+
'xdebug "Xdebug $xdebug_version enabled as coverage driver"';
|
|
51
|
+
}
|
|
52
|
+
else {
|
|
53
|
+
script += await utils.addLog('$cross', extension, error, os);
|
|
51
54
|
}
|
|
52
|
-
script += await utils.addLog(status, extension, message, os);
|
|
53
55
|
return script;
|
|
54
56
|
}
|
|
55
57
|
exports.addCoverageXdebug = addCoverageXdebug;
|
|
@@ -64,7 +66,9 @@ async function addCoveragePCOV(version, os, pipe) {
|
|
|
64
66
|
(await extensions.addExtension('pcov', version, os, true)) + pipe;
|
|
65
67
|
script += (await config.addINIValues('pcov.enabled=1', os, true)) + '\n';
|
|
66
68
|
script += await utils.setVariable('pcov_version', 'php -r "echo phpversion(\'pcov\');"', os);
|
|
67
|
-
script +=
|
|
69
|
+
script +=
|
|
70
|
+
(await utils.getCommand(os, 'extension_log')) +
|
|
71
|
+
'pcov "PCOV $pcov_version enabled as coverage driver"';
|
|
68
72
|
break;
|
|
69
73
|
case /5\.[3-6]|7\.0/.test(version):
|
|
70
74
|
script += await utils.addLog('$cross', 'pcov', 'PHP 7.1 or newer is required', os);
|
package/lib/coverage.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"coverage.js","sourceRoot":"","sources":["../src/coverage.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AACjC,yDAA2C;AAC3C,iDAAmC;AAE5B,KAAK,UAAU,gBAAgB,CACpC,SAAiB,EACjB,OAAe;IAEf,IACE,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,SAAS,IAAI,SAAS,CAAC;QACjE,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,SAAS,IAAI,SAAS,CAAC,EACtD;QACA,OAAO,SAAS,GAAG,2BAA2B,GAAG,OAAO,CAAC;KAC1D;IACD,OAAO,EAAE,CAAC;AACZ,CAAC;AAXD,4CAWC;AAUM,KAAK,UAAU,iBAAiB,CACrC,SAAiB,EACjB,OAAe,EACf,EAAU,EACV,IAAY;IAEZ,IAAI,MAAM,GAAG,IAAI,CAAC;IAClB,
|
|
1
|
+
{"version":3,"file":"coverage.js","sourceRoot":"","sources":["../src/coverage.ts"],"names":[],"mappings":"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"}
|
package/lib/extensions.js
CHANGED
|
@@ -43,11 +43,13 @@ async function addExtensionDarwin(extension_csv, version) {
|
|
|
43
43
|
case /.+-.+\/.+@.+/.test(extension):
|
|
44
44
|
add_script += await utils.parseExtensionSource(extension, ext_prefix);
|
|
45
45
|
return;
|
|
46
|
+
case /^(7\.4|8\.[0-2])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
|
|
46
47
|
case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
|
|
47
48
|
case /^couchbase|^event|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(extension):
|
|
48
49
|
case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
|
|
49
50
|
case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4|(7\.4|8\.[0-2])phalcon5/.test(version_extension):
|
|
50
51
|
case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
|
|
52
|
+
case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
|
|
51
53
|
add_script += await utils.customPackage(ext_name, 'extensions', extension, 'darwin');
|
|
52
54
|
return;
|
|
53
55
|
case /.+-(stable|beta|alpha|devel|snapshot|rc|preview)/.test(extension):
|
|
@@ -97,6 +99,7 @@ async function addExtensionWindows(extension_csv, version) {
|
|
|
97
99
|
case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
|
|
98
100
|
case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-2])phalcon5$/.test(version_extension):
|
|
99
101
|
case /^(7\.[1-4]|8\.1)(pecl_)?http/.test(version_extension):
|
|
102
|
+
case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
|
|
100
103
|
add_script += await utils.customPackage(ext_name, 'extensions', extension, 'win32');
|
|
101
104
|
return;
|
|
102
105
|
case /.+-(stable|beta|alpha|devel|snapshot)/.test(extension):
|
|
@@ -157,6 +160,7 @@ async function addExtensionLinux(extension_csv, version) {
|
|
|
157
160
|
case /.+-.+\/.+@.+/.test(extension):
|
|
158
161
|
add_script += await utils.parseExtensionSource(extension, ext_prefix);
|
|
159
162
|
return;
|
|
163
|
+
case /^(7\.4|8\.[0-2])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
|
|
160
164
|
case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
|
|
161
165
|
case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(version_extension):
|
|
162
166
|
case /^couchbase|^event|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(extension):
|
|
@@ -164,6 +168,7 @@ async function addExtensionLinux(extension_csv, version) {
|
|
|
164
168
|
case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
|
|
165
169
|
case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-2])phalcon5$/.test(version_extension):
|
|
166
170
|
case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
|
|
171
|
+
case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
|
|
167
172
|
add_script += await utils.customPackage(ext_name, 'extensions', extension, 'linux');
|
|
168
173
|
return;
|
|
169
174
|
case /.+-(stable|beta|alpha|devel|snapshot|rc|preview)/.test(extension):
|
package/lib/extensions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../src/extensions.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAiC;AAQ1B,KAAK,UAAU,kBAAkB,CACtC,aAAqB,EACrB,OAAe;IAEf,MAAM,UAAU,GAAkB,MAAM,KAAK,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;IAC5E,IAAI,UAAU,GAAG,IAAI,CAAC;IACtB,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,MAAM,KAAK,CAAC,YAAY,CAAC,UAAU,EAAE,KAAK,WAAW,SAAiB;QACpE,MAAM,iBAAiB,GAAW,OAAO,GAAG,SAAS,CAAC;QACtD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAa,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC/D,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAE5D,QAAQ,IAAI,EAAE;YAEZ,KAAK,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;gBACtB,aAAa,IAAI,qBAAqB,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBACrE,OAAO;YAET,KAAK,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;gBAC1B,UAAU,IAAI,sBAAsB,CAAC;gBACrC,OAAO;YAET,KAAK,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC;gBACjC,UAAU,IAAI,MAAM,KAAK,CAAC,oBAAoB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;gBACtE,OAAO;
|
|
1
|
+
{"version":3,"file":"extensions.js","sourceRoot":"","sources":["../src/extensions.ts"],"names":[],"mappings":"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"}
|
package/lib/tools.js
CHANGED
|
@@ -161,16 +161,20 @@ async function addArchive(data) {
|
|
|
161
161
|
}
|
|
162
162
|
exports.addArchive = addArchive;
|
|
163
163
|
async function addPackage(data) {
|
|
164
|
-
const command = await utils.getCommand(data['os'], '
|
|
164
|
+
const command = await utils.getCommand(data['os'], 'composer_tool');
|
|
165
165
|
const parts = data['repository'].split('/');
|
|
166
166
|
const args = await utils.joins(parts[1], data['release'], parts[0] + '/', data['scope']);
|
|
167
167
|
return command + args;
|
|
168
168
|
}
|
|
169
169
|
exports.addPackage = addPackage;
|
|
170
170
|
async function addBlackfirePlayer(data) {
|
|
171
|
-
if (
|
|
172
|
-
data['
|
|
173
|
-
|
|
171
|
+
if (data['version'] == 'latest') {
|
|
172
|
+
if (/5\.[5-6]|7\.0/.test(data['php_version'])) {
|
|
173
|
+
data['version'] = '1.9.3';
|
|
174
|
+
}
|
|
175
|
+
else if (/7\.[1-4]|8\.0/.test(data['php_version'])) {
|
|
176
|
+
data['version'] = '1.22.0';
|
|
177
|
+
}
|
|
174
178
|
}
|
|
175
179
|
data['url'] = await getPharUrl(data);
|
|
176
180
|
return addArchive(data);
|
package/lib/tools.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"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"}
|
package/lib/utils.js
CHANGED
|
@@ -215,7 +215,12 @@ async function getCommand(os, suffix) {
|
|
|
215
215
|
case 'darwin':
|
|
216
216
|
return 'add_' + suffix + ' ';
|
|
217
217
|
case 'win32':
|
|
218
|
-
return 'Add-' +
|
|
218
|
+
return ('Add-' +
|
|
219
|
+
suffix
|
|
220
|
+
.split('_')
|
|
221
|
+
.map((part) => part.charAt(0).toUpperCase() + part.slice(1))
|
|
222
|
+
.join('') +
|
|
223
|
+
' ');
|
|
219
224
|
default:
|
|
220
225
|
return await log('Platform ' + os + ' is not supported', os, 'error');
|
|
221
226
|
}
|
package/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,oDAAsC;AACtC,+CAAiC;AAO1B,KAAK,UAAU,OAAO,CAAC,QAAgB;IAC5C,MAAM,WAAW,GAAW,QAAQ,CAAC,WAAW,EAAE,CAAC;IACnD,MAAM,WAAW,GAAW,QAAQ,CAAC,WAAW,EAAE,CAAC;IACnD,OAAO,CACL,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC;QACrB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC;QACxB,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC1C,EAAE,CACH,CAAC;AACJ,CAAC;AAXD,0BAWC;AAQM,KAAK,UAAU,QAAQ,CAC5B,IAAY,EACZ,SAAkB;IAElB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,QAAQ,IAAI,EAAE;QACZ,KAAK,KAAK,IAAI,EAAE;YACd,OAAO,KAAK,CAAC;QACf,KAAK,KAAK,IAAI,EAAE,IAAI,SAAS,IAAI,EAAE;YACjC,OAAO,SAAS,CAAC;QACnB,KAAK,KAAK,IAAI,EAAE,IAAI,SAAS,IAAI,EAAE,IAAI,SAAS;YAC9C,MAAM,IAAI,KAAK,CAAC,oCAAoC,IAAI,EAAE,CAAC,CAAC;QAC9D;YACE,OAAO,EAAE,CAAC;KACb;AACH,CAAC;AAhBD,4BAgBC;AAKM,KAAK,UAAU,cAAc;IAClC,OAAO,gGAAgG,CAAC;AAC1G,CAAC;AAFD,wCAEC;AAOM,KAAK,UAAU,YAAY,CAAC,OAAe;IAChD,MAAM,QAAQ,GAAG,MAAM,cAAc,EAAE,CAAC;IACxC,QAAQ,IAAI,EAAE;QACZ,KAAK,2BAA2B,CAAC,IAAI,CAAC,OAAO,CAAC;YAC5C,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QACpE;YACE,QAAQ,IAAI,EAAE;gBACZ,KAAK,OAAO,CAAC,MAAM,GAAG,CAAC;oBACrB,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAC7B;oBACE,OAAO,OAAO,GAAG,IAAI,CAAC;aACzB;KACJ;AACH,CAAC;AAbD,oCAaC;AAOM,KAAK,UAAU,YAAY,CAAC,QAAgB;IACjD,QAAQ,IAAI,EAAE;QACZ,KAAK,iCAAiC,CAAC,IAAI,CAAC,QAAQ,CAAC;YACnD,OAAO,QAAQ,CAAC;QAClB,KAAK,oCAAoC,CAAC,IAAI,CAAC,QAAQ,CAAC;YACtD,OAAO,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC;YACE,OAAO,YAAY,CAAC;KACvB;AACH,CAAC;AATD,oCASC;AASM,KAAK,UAAU,YAAY,CAChC,KAAoB,EACpB,QAIkB;IAElB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QACjD,MAAM,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;KAC5C;AACH,CAAC;AAXD,oCAWC;AAOM,KAAK,UAAU,KAAK,CAAC,IAAY;IACtC,QAAQ,IAAI,EAAE;QACZ,KAAK,OAAO;YACV,OAAO,IAAI,CAAC;QACd,QAAQ;QACR,KAAK,SAAS;YACZ,OAAO,IAAI,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,IAAI,CAAC;KACf;AACH,CAAC;AAVD,sBAUC;AASM,KAAK,UAAU,GAAG,CACvB,OAAe,EACf,EAAU,EACV,QAAgB;IAEhB,QAAQ,EAAE,EAAE;QACV,KAAK,OAAO;YACV,OAAO,CACL,gBAAgB;gBAChB,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC;gBACvB,KAAK;gBACL,OAAO;gBACP,YAAY,CACb,CAAC;QAEJ,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ,CAAC;QACd;YACE,OAAO,CACL,cAAc,GAAG,CAAC,MAAM,KAAK,CAAC,QAAQ,CAAC,CAAC,GAAG,KAAK,GAAG,OAAO,GAAG,WAAW,CACzE,CAAC;KACL;AACH,CAAC;AAtBD,kBAsBC;AAQM,KAAK,UAAU,OAAO,CAAC,OAAe,EAAE,EAAU;IACvD,QAAQ,EAAE,EAAE;QACV,KAAK,OAAO;YACV,OAAO,YAAY,GAAG,OAAO,GAAG,GAAG,CAAC;QACtC,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ;YACX,OAAO,YAAY,GAAG,OAAO,GAAG,GAAG,CAAC;QACtC;YACE,OAAO,MAAM,GAAG,CAAC,WAAW,GAAG,EAAE,GAAG,mBAAmB,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;KACzE;AACH,CAAC;AAVD,0BAUC;AASM,KAAK,UAAU,MAAM,CAC1B,IAAY,EACZ,OAAe,EACf,OAAe,EACf,EAAU;IAEV,QAAQ,EAAE,EAAE;QACV,KAAK,OAAO;YACV,OAAO,WAAW,GAAG,IAAI,GAAG,KAAK,GAAG,OAAO,GAAG,KAAK,GAAG,OAAO,GAAG,GAAG,CAAC;QACtE,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ;YACX,OAAO,WAAW,GAAG,IAAI,GAAG,KAAK,GAAG,OAAO,GAAG,KAAK,GAAG,OAAO,GAAG,GAAG,CAAC;QACtE;YACE,OAAO,MAAM,GAAG,CAAC,WAAW,GAAG,EAAE,GAAG,mBAAmB,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;KACzE;AACH,CAAC;AAfD,wBAeC;AAOM,KAAK,UAAU,cAAc,CAClC,aAAqB;IAErB,QAAQ,aAAa,EAAE;QACrB,KAAK,EAAE,CAAC;QACR,KAAK,GAAG;YACN,OAAO,EAAE,CAAC;QACZ;YACE,OAAO;gBACL,aAAa,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;gBACzD,GAAG,aAAa;qBACb,KAAK,CAAC,GAAG,CAAC;qBAEV,GAAG,CAAC,UAAU,SAAiB;oBAC9B,IAAI,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;wBAClC,OAAO,SAAS,CAAC;qBAClB;oBACD,OAAO,SAAS;yBACb,IAAI,EAAE;yBACN,WAAW,EAAE;yBACb,OAAO,CAAC,qCAAqC,EAAE,MAAM,CAAC,CAAC;gBAC5D,CAAC,CAAC;aACL,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KACrB;AACH,CAAC;AAxBD,wCAwBC;AAQM,KAAK,UAAU,QAAQ,CAAC,UAAkB;IAC/C,QAAQ,UAAU,EAAE;QAClB,KAAK,EAAE,CAAC;QACR,KAAK,GAAG;YACN,OAAO,EAAE,CAAC;QACZ;YACE,OAAO,UAAU;iBACd,KAAK,CAAC,oCAAoC,CAAC;iBAC3C,GAAG,CAAC,UAAU,KAAK;gBAClB,OAAO,KAAK;qBACT,IAAI,EAAE;qBACN,OAAO,CAAC,yBAAyB,EAAE,EAAE,CAAC;qBACtC,OAAO,CAAC,uCAAuC,EAAE,OAAO,CAAC;qBACzD,OAAO,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;YACvC,CAAC,CAAC;iBACD,MAAM,CAAC,OAAO,CAAC,CAAC;KACtB;AACH,CAAC;AAjBD,4BAiBC;AAOM,KAAK,UAAU,kBAAkB,CAAC,SAAiB;IACxD,QAAQ,IAAI,EAAE;QACZ;YACE,OAAO,WAAW,CAAC;QACrB,KAAK,8CAA8C,CAAC,IAAI,CAAC,SAAS,CAAC;YACjE,OAAO,gBAAgB,CAAC;KAC3B;AACH,CAAC;AAPD,gDAOC;AAOM,KAAK,UAAU,cAAc,CAAC,EAAU;IAC7C,QAAQ,EAAE,EAAE;QACV,KAAK,OAAO;YACV,OAAO,cAAc,CAAC;QACxB,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ;YACX,OAAO,kBAAkB,CAAC;QAC5B;YACE,OAAO,MAAM,GAAG,CAAC,WAAW,GAAG,EAAE,GAAG,mBAAmB,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;KACzE;AACH,CAAC;AAVD,wCAUC;AASM,KAAK,UAAU,iBAAiB,CACrC,SAAiB,EACjB,OAAe,EACf,EAAU;IAEV,OAAO,CACL,IAAI;QACJ,CAAC,MAAM,MAAM,CACX,QAAQ,EACR,SAAS,EACT,CAAC,SAAS,EAAE,yBAAyB,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EACzD,EAAE,CACH,CAAC;QACF,IAAI,CACL,CAAC;AACJ,CAAC;AAfD,8CAeC;AAQM,KAAK,UAAU,UAAU,CAAC,EAAU,EAAE,MAAc;IACzD,QAAQ,EAAE,EAAE;QACV,KAAK,OAAO,CAAC;QACb,KAAK,QAAQ;YACX,OAAO,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;QAC/B,KAAK,OAAO;YACV,OAAO,MAAM,GAAG,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "setup-php",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.24.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "Setup PHP for use with GitHub Actions",
|
|
6
6
|
"main": "lib/install.js",
|
|
@@ -39,22 +39,22 @@
|
|
|
39
39
|
"@actions/io": "^1.1.2"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@types/jest": "^29.
|
|
43
|
-
"@types/node": "^18.11.
|
|
44
|
-
"@typescript-eslint/eslint-plugin": "^5.
|
|
45
|
-
"@typescript-eslint/parser": "^5.
|
|
46
|
-
"@vercel/ncc": "^0.36.
|
|
47
|
-
"eslint": "^8.
|
|
48
|
-
"eslint-config-prettier": "^8.
|
|
49
|
-
"eslint-plugin-import": "^2.
|
|
50
|
-
"eslint-plugin-jest": "^27.1
|
|
42
|
+
"@types/jest": "^29.4.0",
|
|
43
|
+
"@types/node": "^18.11.18",
|
|
44
|
+
"@typescript-eslint/eslint-plugin": "^5.49.0",
|
|
45
|
+
"@typescript-eslint/parser": "^5.49.0",
|
|
46
|
+
"@vercel/ncc": "^0.36.1",
|
|
47
|
+
"eslint": "^8.32.0",
|
|
48
|
+
"eslint-config-prettier": "^8.6.0",
|
|
49
|
+
"eslint-plugin-import": "^2.27.5",
|
|
50
|
+
"eslint-plugin-jest": "^27.2.1",
|
|
51
51
|
"eslint-plugin-prettier": "^4.2.1",
|
|
52
|
-
"jest": "^29.
|
|
53
|
-
"jest-circus": "^29.
|
|
54
|
-
"nock": "^13.
|
|
55
|
-
"prettier": "^2.8.
|
|
52
|
+
"jest": "^29.4.1",
|
|
53
|
+
"jest-circus": "^29.4.1",
|
|
54
|
+
"nock": "^13.3.0",
|
|
55
|
+
"prettier": "^2.8.3",
|
|
56
56
|
"simple-git-hooks": "^2.8.1",
|
|
57
|
-
"ts-jest": "^29.0.
|
|
57
|
+
"ts-jest": "^29.0.5",
|
|
58
58
|
"typescript": "^4.9.4"
|
|
59
59
|
},
|
|
60
60
|
"bugs": {
|
package/src/coverage.ts
CHANGED
|
@@ -16,7 +16,7 @@ export async function checkXdebugError(
|
|
|
16
16
|
}
|
|
17
17
|
|
|
18
18
|
/**
|
|
19
|
-
* Function to
|
|
19
|
+
* Function to set up Xdebug
|
|
20
20
|
*
|
|
21
21
|
* @param extension
|
|
22
22
|
* @param version
|
|
@@ -30,9 +30,8 @@ export async function addCoverageXdebug(
|
|
|
30
30
|
pipe: string
|
|
31
31
|
): Promise<string> {
|
|
32
32
|
let script = '\n';
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
if (!message) {
|
|
33
|
+
const error: string = await checkXdebugError(extension, version);
|
|
34
|
+
if (!error) {
|
|
36
35
|
script +=
|
|
37
36
|
(await extensions.addExtension(':pcov:false', version, os, true)) + pipe;
|
|
38
37
|
extension = extension == 'xdebug3' ? 'xdebug' : extension;
|
|
@@ -43,15 +42,17 @@ export async function addCoverageXdebug(
|
|
|
43
42
|
'php -r "echo phpversion(\'xdebug\');"',
|
|
44
43
|
os
|
|
45
44
|
);
|
|
46
|
-
|
|
47
|
-
|
|
45
|
+
script +=
|
|
46
|
+
(await utils.getCommand(os, 'extension_log')) +
|
|
47
|
+
'xdebug "Xdebug $xdebug_version enabled as coverage driver"';
|
|
48
|
+
} else {
|
|
49
|
+
script += await utils.addLog('$cross', extension, error, os);
|
|
48
50
|
}
|
|
49
|
-
script += await utils.addLog(status, extension, message, os);
|
|
50
51
|
return script;
|
|
51
52
|
}
|
|
52
53
|
|
|
53
54
|
/**
|
|
54
|
-
* Function to
|
|
55
|
+
* Function to set up PCOV
|
|
55
56
|
*
|
|
56
57
|
* @param version
|
|
57
58
|
* @param os
|
|
@@ -76,14 +77,9 @@ export async function addCoveragePCOV(
|
|
|
76
77
|
'php -r "echo phpversion(\'pcov\');"',
|
|
77
78
|
os
|
|
78
79
|
);
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
'$
|
|
82
|
-
'coverage: pcov',
|
|
83
|
-
'PCOV $pcov_version enabled as coverage driver',
|
|
84
|
-
os
|
|
85
|
-
);
|
|
86
|
-
// version is not supported
|
|
80
|
+
script +=
|
|
81
|
+
(await utils.getCommand(os, 'extension_log')) +
|
|
82
|
+
'pcov "PCOV $pcov_version enabled as coverage driver"';
|
|
87
83
|
break;
|
|
88
84
|
|
|
89
85
|
case /5\.[3-6]|7\.0/.test(version):
|
package/src/extensions.ts
CHANGED
|
@@ -31,11 +31,14 @@ export async function addExtensionDarwin(
|
|
|
31
31
|
case /.+-.+\/.+@.+/.test(extension):
|
|
32
32
|
add_script += await utils.parseExtensionSource(extension, ext_prefix);
|
|
33
33
|
return;
|
|
34
|
+
// match 7.4relay...8.2relay
|
|
34
35
|
// match 5.3blackfire...8.2blackfire
|
|
35
36
|
// match 5.3blackfire-(semver)...8.1blackfire-(semver)
|
|
36
37
|
// match couchbase, event, geos, pdo_oci, oci8, http, pecl_http
|
|
37
38
|
// match 5.3ioncube...7.4ioncube
|
|
38
39
|
// match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.2phalcon5
|
|
40
|
+
// match 7.0zephir_parser...8.2zephir_parser
|
|
41
|
+
case /^(7\.4|8\.[0-2])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
|
|
39
42
|
case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])blackfire(-\d+\.\d+\.\d+)?$/.test(
|
|
40
43
|
version_extension
|
|
41
44
|
):
|
|
@@ -47,6 +50,9 @@ export async function addExtensionDarwin(
|
|
|
47
50
|
version_extension
|
|
48
51
|
):
|
|
49
52
|
case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
|
|
53
|
+
case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
|
|
54
|
+
version_extension
|
|
55
|
+
):
|
|
50
56
|
add_script += await utils.customPackage(
|
|
51
57
|
ext_name,
|
|
52
58
|
'extensions',
|
|
@@ -134,6 +140,7 @@ export async function addExtensionWindows(
|
|
|
134
140
|
// match 5.3ioncube...7.4ioncube
|
|
135
141
|
// match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.2phalcon5
|
|
136
142
|
// match 7.1pecl_http...8.1pecl_http and 7.1http...8.1http
|
|
143
|
+
// match 7.0zephir_parser...8.2zephir_parser
|
|
137
144
|
case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])blackfire(-\d+\.\d+\.\d+)?$/.test(
|
|
138
145
|
version_extension
|
|
139
146
|
):
|
|
@@ -143,6 +150,9 @@ export async function addExtensionWindows(
|
|
|
143
150
|
version_extension
|
|
144
151
|
):
|
|
145
152
|
case /^(7\.[1-4]|8\.1)(pecl_)?http/.test(version_extension):
|
|
153
|
+
case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
|
|
154
|
+
version_extension
|
|
155
|
+
):
|
|
146
156
|
add_script += await utils.customPackage(
|
|
147
157
|
ext_name,
|
|
148
158
|
'extensions',
|
|
@@ -252,12 +262,15 @@ export async function addExtensionLinux(
|
|
|
252
262
|
case /.+-.+\/.+@.+/.test(extension):
|
|
253
263
|
add_script += await utils.parseExtensionSource(extension, ext_prefix);
|
|
254
264
|
return;
|
|
265
|
+
// match 7.4relay...8.2relay
|
|
255
266
|
// match 5.3blackfire...8.2blackfire
|
|
256
267
|
// match 5.3blackfire-(semver)...8.1blackfire-(semver)
|
|
257
268
|
// match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
|
|
258
269
|
// match couchbase, geos, pdo_oci, oci8, http, pecl_http
|
|
259
270
|
// match 5.3ioncube...7.4ioncube
|
|
260
271
|
// match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, 7.4phalcon5...8.2phalcon5
|
|
272
|
+
// match 7.0zephir_parser...8.2zephir_parser
|
|
273
|
+
case /^(7\.4|8\.[0-2])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
|
|
261
274
|
case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])blackfire(-\d+\.\d+\.\d+)?$/.test(
|
|
262
275
|
version_extension
|
|
263
276
|
):
|
|
@@ -273,6 +286,9 @@ export async function addExtensionLinux(
|
|
|
273
286
|
version_extension
|
|
274
287
|
):
|
|
275
288
|
case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
|
|
289
|
+
case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
|
|
290
|
+
version_extension
|
|
291
|
+
):
|
|
276
292
|
add_script += await utils.customPackage(
|
|
277
293
|
ext_name,
|
|
278
294
|
'extensions',
|
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
Function Add-ExtensionLog() {
|
|
2
|
+
Param (
|
|
3
|
+
[Parameter(Position = 0, Mandatory = $true)]
|
|
4
|
+
[ValidateNotNull()]
|
|
5
|
+
$extension,
|
|
6
|
+
[Parameter(Position = 1, Mandatory = $true)]
|
|
7
|
+
[ValidateNotNull()]
|
|
8
|
+
$message
|
|
9
|
+
)
|
|
10
|
+
$extension_info = Get-PhpExtension -Path $php_dir | Where-Object { $_.Name -eq $extension -or $_.Handle -eq $extension }
|
|
11
|
+
if ($null -ne $extension_info -and ($extension_info.State -eq 'Enabled' -or $extension_info.State -eq 'Builtin')) {
|
|
12
|
+
Add-Log $tick $extension $message
|
|
13
|
+
} else {
|
|
14
|
+
Add-Log $cross $extension "Could not install $extension on PHP $( $installed.FullVersion )"
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
|
|
1
18
|
# Function to link dependencies to PHP directory.
|
|
2
19
|
Function Set-ExtensionPrerequisites
|
|
3
20
|
{
|
|
@@ -4,7 +4,7 @@ Function Add-Choco() {
|
|
|
4
4
|
# Source: https://docs.chocolatey.org/en-us/choco/setup
|
|
5
5
|
Set-ExecutionPolicy Bypass -Scope Process -Force
|
|
6
6
|
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
|
|
7
|
-
Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
|
|
7
|
+
Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
|
|
8
8
|
}
|
|
9
9
|
} catch { }
|
|
10
10
|
}
|
|
@@ -47,10 +47,5 @@ Function Add-Http() {
|
|
|
47
47
|
}
|
|
48
48
|
Add-Extension pecl_http >$null 2>&1
|
|
49
49
|
Repair-ICU
|
|
50
|
-
|
|
51
|
-
php --ri "http" 2> $null | Out-Null
|
|
52
|
-
Add-Log $tick "http" "Installed and enabled"
|
|
53
|
-
} catch {
|
|
54
|
-
Add-Log $cross "http" "Could not install http on PHP $( $installed.FullVersion )"
|
|
55
|
-
}
|
|
50
|
+
Add-ExtensionLog http "Installed and enabled"
|
|
56
51
|
}
|
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
# Get relay version
|
|
2
|
+
get_relay_version() {
|
|
3
|
+
local ext=$1
|
|
4
|
+
if [[ "$ext" =~ ^relay$ ]]; then
|
|
5
|
+
get -s -n "" "${relay_releases:?}"/latest 2<&1 | grep -m 1 -Eo "tag/(v[0-9]+(\.[0-9]+)?(\.[0-9]+)?)" | head -n 1 | cut -d '/' -f 2
|
|
6
|
+
else
|
|
7
|
+
relay_version="${ext##*-}"
|
|
8
|
+
echo "v${relay_version/v//}"
|
|
9
|
+
fi
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
# Get OS suffix in relay artifact URL.
|
|
13
|
+
get_os_suffix() {
|
|
14
|
+
if [ "$os" = "Linux" ]; then
|
|
15
|
+
if [[ "$ID" =~ ubuntu|debian ]]; then
|
|
16
|
+
echo debian
|
|
17
|
+
elif [ "$ID" = "centos" ]; then
|
|
18
|
+
echo centos"$VERSION_ID"
|
|
19
|
+
else
|
|
20
|
+
echo "$ID"
|
|
21
|
+
fi
|
|
22
|
+
else
|
|
23
|
+
echo darwin
|
|
24
|
+
fi
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
# Get openssl suffix in relay artifact URL.
|
|
28
|
+
get_openssl_suffix() {
|
|
29
|
+
openssl_3=$(php -r "echo strpos(OPENSSL_VERSION_TEXT, 'SSL 3') !== false;")
|
|
30
|
+
[ "$openssl_3" = "1" ] && echo '.libssl3' || echo ''
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
# Change library paths in relay binary.
|
|
34
|
+
change_library_paths() {
|
|
35
|
+
if [ "$os" = "Darwin" ]; then
|
|
36
|
+
otool -L "${ext_dir:?}"/relay.so | grep -q 'ssl.1' && openssl_version='1.1' || openssl_version='3'
|
|
37
|
+
[ -e "${brew_prefix:?}"/opt/openssl@"$openssl_version" ] || brew install openssl@"$openssl_version"
|
|
38
|
+
dylibs="$(otool -L "${ext_dir:?}"/relay.so | grep -Eo '.*\.dylib' | cut -f1 -d ' ')"
|
|
39
|
+
install_name_tool -change "$(echo "${dylibs}" | grep -E "libzstd.*dylib" | xargs)" "$brew_prefix"/opt/zstd/lib/libzstd.dylib "$ext_dir"/relay.so
|
|
40
|
+
install_name_tool -change "$(echo "${dylibs}" | grep -E "liblz4.*dylib" | xargs)" "$brew_prefix"/opt/lz4/lib/liblz4.dylib "$ext_dir"/relay.so
|
|
41
|
+
install_name_tool -change "$(echo "${dylibs}" | grep -E "libssl.*dylib" | xargs)" "$brew_prefix"/opt/openssl@"$openssl_version"/lib/libssl.dylib "$ext_dir"/relay.so
|
|
42
|
+
install_name_tool -change "$(echo "${dylibs}" | grep -E "libcrypto.*dylib" | xargs)" "$brew_prefix"/opt/openssl@"$openssl_version"/lib/libcrypto.dylib "$ext_dir"/relay.so
|
|
43
|
+
fi
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
# Add relay dependencies
|
|
47
|
+
add_relay_dependencies() {
|
|
48
|
+
add_extension json
|
|
49
|
+
add_extension msgpack
|
|
50
|
+
add_extension igbinary
|
|
51
|
+
if [ "$os" = "Darwin" ]; then
|
|
52
|
+
. "${0%/*}"/tools/brew.sh
|
|
53
|
+
configure_brew
|
|
54
|
+
brew install hiredis lz4 zstd
|
|
55
|
+
fi
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
# Initialize relay extension ini configuration
|
|
59
|
+
init_relay_ini() {
|
|
60
|
+
relay_ini=$1
|
|
61
|
+
if [ -e "$relay_ini" ]; then
|
|
62
|
+
if [[ -n "$RELAY_KEY" ]]; then
|
|
63
|
+
sudo sed -i.bak "s/^; relay.key =.*/relay.key = $RELAY_KEY/" "$relay_ini"
|
|
64
|
+
fi
|
|
65
|
+
if [[ -n "$RELAY_ENVIRONMENT" ]]; then
|
|
66
|
+
sudo sed -i.bak "s/^; relay.environment =.*/relay.environment = $RELAY_ENVIRONMENT/" "$relay_ini"
|
|
67
|
+
fi
|
|
68
|
+
if [[ -n "$RELAY_EVICTION_POLICY" ]]; then
|
|
69
|
+
sudo sed -i.bak "s/^; relay.eviction_policy =.*/relay.eviction_policy = $RELAY_EVICTION_POLICY/" "$relay_ini"
|
|
70
|
+
fi
|
|
71
|
+
if [[ -n "$RELAY_MAX_MEMORY" ]]; then
|
|
72
|
+
sudo sed -i.bak "s/^; relay.maxmemory =.*/relay.maxmemory = $RELAY_MAX_MEMORY/" "$relay_ini"
|
|
73
|
+
fi
|
|
74
|
+
sudo rm -rf "$relay_ini".bak
|
|
75
|
+
fi
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
# Enable relay extension
|
|
79
|
+
enable_relay() {
|
|
80
|
+
relay_ini=$1
|
|
81
|
+
if [ -e "$relay_ini" ]; then
|
|
82
|
+
init_relay_ini "$relay_ini"
|
|
83
|
+
if [ "$os" = "Linux" ]; then
|
|
84
|
+
sudo cp "$relay_ini" "${ini_dir:?}"/../mods-available/relay.ini
|
|
85
|
+
sudo phpenmod -v "${version:?}" relay
|
|
86
|
+
else
|
|
87
|
+
sudo cp "${relay_ini}" "${scan_dir:?}"/60-relay.ini
|
|
88
|
+
fi
|
|
89
|
+
fi
|
|
90
|
+
}
|
|
91
|
+
|
|
92
|
+
# Patch binary id in relay extension
|
|
93
|
+
init_relay_binary_id() {
|
|
94
|
+
if [ -e "${ext_dir:?}"/relay.so ]; then
|
|
95
|
+
grep -aq 00000000 "${ext_dir:?}"/relay.so && \
|
|
96
|
+
sudo LC_ALL=C sed -i.bak "s/00000000-0000-0000-0000-000000000000/$(uuidgen)/" "$ext_dir"/relay.so
|
|
97
|
+
fi
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
# Configure relay extension
|
|
101
|
+
configure_relay() {
|
|
102
|
+
change_library_paths
|
|
103
|
+
init_relay_binary_id
|
|
104
|
+
enable_relay "${ext_dir}"/relay.ini
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
# Helper function to add relay extension
|
|
108
|
+
add_relay_helper() {
|
|
109
|
+
arch="$(uname -m | sed 's/_/-/')"
|
|
110
|
+
os_suffix="$(get_os_suffix)"
|
|
111
|
+
openssl_suffix="$(get_openssl_suffix)"
|
|
112
|
+
artifact_file_name="relay-$relay_version-php${version:?}-$os_suffix-$arch$openssl_suffix.tar.gz"
|
|
113
|
+
url="$relay_releases"/download/"$relay_version"/"$artifact_file_name"
|
|
114
|
+
fallback_url="$relay_trunk"/"$artifact_file_name"
|
|
115
|
+
get -q -n /tmp/relay.tar.gz "$url" "$fallback_url"
|
|
116
|
+
if [ "$openssl_suffix" = '.libssl3' ] && (! [ -e /tmp/relay.tar.gz ] || ! file /tmp/relay.tar.gz | grep -q 'gzip'); then
|
|
117
|
+
get -q -n /tmp/relay.tar.gz "${url/.libssl3/}" "${fallback_url/.libssl3/}"
|
|
118
|
+
fi
|
|
119
|
+
if [ -e /tmp/relay.tar.gz ] && file /tmp/relay.tar.gz | grep -q 'gzip'; then
|
|
120
|
+
sudo tar --strip-components=1 -xzf /tmp/relay.tar.gz -C "${ext_dir:?}"
|
|
121
|
+
sudo mv "${ext_dir:?}"/relay-pkg.so "${ext_dir:?}"/relay.so
|
|
122
|
+
fi
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
# Add relay extension
|
|
126
|
+
add_relay() {
|
|
127
|
+
local ext=$1
|
|
128
|
+
local arch
|
|
129
|
+
local url
|
|
130
|
+
os=$(uname -s)
|
|
131
|
+
relay_releases=https://github.com/cachewerk/relay/releases
|
|
132
|
+
relay_trunk=https://builds.r2.relay.so
|
|
133
|
+
relay_version=$(get_relay_version "$ext")
|
|
134
|
+
add_relay_dependencies >/dev/null 2>&1
|
|
135
|
+
if shared_extension relay; then
|
|
136
|
+
message="Enabled"
|
|
137
|
+
else
|
|
138
|
+
add_relay_helper >/dev/null 2>&1
|
|
139
|
+
message="Installed and enabled"
|
|
140
|
+
fi
|
|
141
|
+
configure_relay >/dev/null 2>&1
|
|
142
|
+
add_extension_log relay "$message"
|
|
143
|
+
}
|
|
@@ -13,7 +13,7 @@ parse_args() {
|
|
|
13
13
|
# Function to parse configure options for pecl
|
|
14
14
|
# Make sure we have all options in name="value" form i.e XML properties.
|
|
15
15
|
parse_pecl_configure_options() {
|
|
16
|
-
configure_opts=$(echo "$1" | sed -
|
|
16
|
+
configure_opts=$(echo "$1" | sed -E -e "s#['\"]|--##g")
|
|
17
17
|
IFS=' ' read -r -a opts_array <<< "$configure_opts"
|
|
18
18
|
output_opts=()
|
|
19
19
|
for opt in "${opts_array[@]}"; do
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
# Function to get the url of the phalcon release asset.
|
|
2
|
+
Function Get-ZephirParserReleaseAssetUrl() {
|
|
3
|
+
Param (
|
|
4
|
+
[Parameter(Position = 0, Mandatory = $true)]
|
|
5
|
+
[ValidateNotNull()]
|
|
6
|
+
[string]
|
|
7
|
+
$extension_version
|
|
8
|
+
)
|
|
9
|
+
$repo = 'zephir-lang/php-zephir-parser'
|
|
10
|
+
$zp_releases = "$github/$repo/releases"
|
|
11
|
+
try {
|
|
12
|
+
$match = (Invoke-RestMethod -Uri "https://api.github.com/repos/$repo/tags/$extension_version").assets | Select-String -Pattern "browser_download_url=.*(zephir_parser-php-${version}.*windows.*.zip)"
|
|
13
|
+
} catch {
|
|
14
|
+
$match = (Invoke-WebRequest -Uri "$zp_releases/expanded_assets/$extension_version").Links.href | Select-String -Pattern "(zephir_parser-php-${version}.*windows.*.zip)"
|
|
15
|
+
}
|
|
16
|
+
if($NULL -ne $match) {
|
|
17
|
+
return "$zp_releases/download/$extension_version/$($match.Matches[0].Groups[1].Value)"
|
|
18
|
+
}
|
|
19
|
+
return false;
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
# Function to get zephir parser version using GitHub releases.
|
|
23
|
+
Function Get-ZephirParserVersion() {
|
|
24
|
+
Param (
|
|
25
|
+
[Parameter(Position = 0, Mandatory = $true)]
|
|
26
|
+
[ValidateNotNull()]
|
|
27
|
+
[string]
|
|
28
|
+
$extension
|
|
29
|
+
)
|
|
30
|
+
$repo = 'zephir-lang/php-zephir-parser'
|
|
31
|
+
$zp_releases = "$github/$repo/releases"
|
|
32
|
+
if($extension -eq 'zephir_parser') {
|
|
33
|
+
return (Invoke-WebRequest -UseBasicParsing -Uri $zp_releases/latest).BaseResponse.RequestMessage.RequestUri.Segments[-1]
|
|
34
|
+
} else {
|
|
35
|
+
return 'v' + ($extension.split('-')[1] -replace 'v')
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
# Function to add zephir parser using GitHub releases.
|
|
40
|
+
Function Add-ZephirParserFromGitHub() {
|
|
41
|
+
Param (
|
|
42
|
+
[Parameter(Position = 0, Mandatory = $true)]
|
|
43
|
+
[ValidateNotNull()]
|
|
44
|
+
[string]
|
|
45
|
+
$extension
|
|
46
|
+
)
|
|
47
|
+
$extension_version = Get-ZephirParserVersion $extension
|
|
48
|
+
$zip_url = Get-ZephirParserReleaseAssetUrl $extension_version
|
|
49
|
+
if($zip_url) {
|
|
50
|
+
Invoke-WebRequest -Uri $zip_url -OutFile $ENV:RUNNER_TOOL_CACHE\zp.zip > $null 2>&1
|
|
51
|
+
Expand-Archive -Path $ENV:RUNNER_TOOL_CACHE\zp.zip -DestinationPath $ENV:RUNNER_TOOL_CACHE\zp -Force > $null 2>&1
|
|
52
|
+
Copy-Item -Path "$ENV:RUNNER_TOOL_CACHE\zp\php_zephir_parser.dll" -Destination "$ext_dir\php_zephir_parser.dll"
|
|
53
|
+
Enable-PhpExtension -Extension zephir_parser -Path $php_dir
|
|
54
|
+
} else {
|
|
55
|
+
throw "Unable to get zephir_parser release from the GitHub repo"
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
# Function to add zephir parser.
|
|
60
|
+
Function Add-ZephirParser() {
|
|
61
|
+
Param (
|
|
62
|
+
[Parameter(Position = 0, Mandatory = $true)]
|
|
63
|
+
[ValidateNotNull()]
|
|
64
|
+
[string]
|
|
65
|
+
$extension
|
|
66
|
+
)
|
|
67
|
+
try {
|
|
68
|
+
$status = 'Enabled'
|
|
69
|
+
if (Test-Path $ext_dir\php_zephir_parser.dll) {
|
|
70
|
+
Enable-PhpExtension -Extension zephir_parser -Path $php_dir
|
|
71
|
+
} else {
|
|
72
|
+
$status = 'Installed and enabled'
|
|
73
|
+
Add-ZephirParserFromGitHub $extension
|
|
74
|
+
}
|
|
75
|
+
Add-ExtensionLog zephir_parser $status
|
|
76
|
+
} catch {
|
|
77
|
+
Add-Log $cross $extension "Could not install $extension on PHP $($installed.FullVersion)"
|
|
78
|
+
}
|
|
79
|
+
}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
# Get zephir_parser version
|
|
2
|
+
get_zephir_parser_version() {
|
|
3
|
+
local ext=$1
|
|
4
|
+
if [[ "$ext" =~ ^zephir_parser$ ]]; then
|
|
5
|
+
get -s -n "" "${zp_releases:?}"/latest 2<&1 | grep -m 1 -Eo "tag/(v?[0-9]+(\.[0-9]+)?(\.[0-9]+)?)" | head -n 1 | cut -d '/' -f 2
|
|
6
|
+
else
|
|
7
|
+
zp_version="${ext##*-}"
|
|
8
|
+
echo "v${zp_version/v//}"
|
|
9
|
+
fi
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
# Add zephir_parser helper
|
|
13
|
+
add_zephir_parser_helper() {
|
|
14
|
+
local ext=$1
|
|
15
|
+
ext_version=$(get_zephir_parser_version "$ext")
|
|
16
|
+
[ "$(uname -s)" = "Linux" ] && os_suffix=ubuntu || os_suffix=macos
|
|
17
|
+
build_name=$(get -s -n "" https://api.github.com/repos/"$repo"/releases/tags/"$ext_version" | grep -Eo "zephir_parser-php-${version:?}.*$os_suffix-.*.zip" | head -n 1)
|
|
18
|
+
[ -z "$build_name" ] && build_name=$(get -s -n "" "$zp_releases"/expanded_assets/"$ext_version" | grep -Eo "zephir_parser-php-${version:?}.*$os_suffix-.*.zip" | head -n 1)
|
|
19
|
+
get -q -e "/tmp/zp.zip" "$zp_releases"/download/"$ext_version"/"$build_name"
|
|
20
|
+
sudo unzip -o "/tmp/zp.zip" -d "${ext_dir:?}"
|
|
21
|
+
enable_extension zephir_parser extension
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
# Add zephir_parser
|
|
25
|
+
add_zephir_parser() {
|
|
26
|
+
ext=$1
|
|
27
|
+
repo=zephir-lang/php-zephir-parser
|
|
28
|
+
zp_releases=https://github.com/"$repo"/releases
|
|
29
|
+
if ! shared_extension zephir_parser; then
|
|
30
|
+
message='Installed and enabled'
|
|
31
|
+
add_zephir_parser_helper "$ext" >/dev/null 2>&1
|
|
32
|
+
else
|
|
33
|
+
message='Enabled'
|
|
34
|
+
enable_extension zephir_parser extension
|
|
35
|
+
fi
|
|
36
|
+
add_extension_log zephir_parser "$message"
|
|
37
|
+
}
|
package/src/scripts/linux.sh
CHANGED
|
@@ -183,7 +183,7 @@ Function Add-Tool() {
|
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
185
|
|
|
186
|
-
Function Add-
|
|
186
|
+
Function Add-ComposerToolHelper() {
|
|
187
187
|
Param (
|
|
188
188
|
[Parameter(Position = 0, Mandatory = $true)]
|
|
189
189
|
[string]
|
|
@@ -234,7 +234,7 @@ Function Add-ComposertoolHelper() {
|
|
|
234
234
|
}
|
|
235
235
|
|
|
236
236
|
# Function to setup a tool using composer.
|
|
237
|
-
Function Add-
|
|
237
|
+
Function Add-ComposerTool() {
|
|
238
238
|
Param (
|
|
239
239
|
[Parameter(Position = 0, Mandatory = $true)]
|
|
240
240
|
[ValidateNotNull()]
|
|
@@ -267,7 +267,7 @@ Function Add-Composertool() {
|
|
|
267
267
|
}
|
|
268
268
|
}
|
|
269
269
|
Enable-PhpExtension -Extension curl, mbstring, openssl -Path $php_dir
|
|
270
|
-
$log = Add-
|
|
270
|
+
$log = Add-ComposerToolHelper $tool $release $prefix $scope $composer_args
|
|
271
271
|
if(Test-Path $composer_bin\composer) {
|
|
272
272
|
Copy-Item -Path "$bin_dir\composer" -Destination "$composer_bin\composer" -Force
|
|
273
273
|
}
|
|
@@ -153,7 +153,7 @@ add_tool() {
|
|
|
153
153
|
}
|
|
154
154
|
|
|
155
155
|
# Function to setup a tool using composer in a different scope.
|
|
156
|
-
|
|
156
|
+
add_composer_tool_helper() {
|
|
157
157
|
tool=$1
|
|
158
158
|
release=$2
|
|
159
159
|
prefix=$3
|
|
@@ -184,7 +184,7 @@ add_composertool_helper() {
|
|
|
184
184
|
}
|
|
185
185
|
|
|
186
186
|
# Function to setup a tool using composer.
|
|
187
|
-
|
|
187
|
+
add_composer_tool() {
|
|
188
188
|
tool=$1
|
|
189
189
|
release=$2
|
|
190
190
|
prefix=$3
|
|
@@ -199,7 +199,7 @@ add_composertool() {
|
|
|
199
199
|
return
|
|
200
200
|
fi
|
|
201
201
|
fi
|
|
202
|
-
|
|
202
|
+
add_composer_tool_helper "$tool" "$release" "$prefix" "$scope" "$composer_args"
|
|
203
203
|
tool_version=$(get_tool_version cat /tmp/composer.log)
|
|
204
204
|
([ -s /tmp/composer.log ] && add_log "$tick" "$tool" "Added $tool $tool_version"
|
|
205
205
|
) || add_log "$cross" "$tool" "Could not setup $tool"
|
|
@@ -7,7 +7,7 @@ Function Add-Msys2() {
|
|
|
7
7
|
return $msys_location
|
|
8
8
|
}
|
|
9
9
|
|
|
10
|
-
Function Add-
|
|
10
|
+
Function Add-GrpcPhpPlugin() {
|
|
11
11
|
$msys_location = Add-Msys2
|
|
12
12
|
$logs = . $msys_location\usr\bin\bash -l -c "pacman -S --noconfirm mingw-w64-x86_64-grpc" >$null 2>&1
|
|
13
13
|
$grpc_version = Get-ToolVersion 'Write-Output' "$logs"
|
package/src/tools.ts
CHANGED
|
@@ -201,7 +201,7 @@ export async function addArchive(data: RS): Promise<string> {
|
|
|
201
201
|
* @param data
|
|
202
202
|
*/
|
|
203
203
|
export async function addPackage(data: RS): Promise<string> {
|
|
204
|
-
const command = await utils.getCommand(data['os'], '
|
|
204
|
+
const command = await utils.getCommand(data['os'], 'composer_tool');
|
|
205
205
|
const parts: string[] = data['repository'].split('/');
|
|
206
206
|
const args: string = await utils.joins(
|
|
207
207
|
parts[1],
|
|
@@ -218,11 +218,12 @@ export async function addPackage(data: RS): Promise<string> {
|
|
|
218
218
|
* @param data
|
|
219
219
|
*/
|
|
220
220
|
export async function addBlackfirePlayer(data: RS): Promise<string> {
|
|
221
|
-
if (
|
|
222
|
-
/5\.[5-6]|7\.0/.test(data['php_version'])
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
221
|
+
if (data['version'] == 'latest') {
|
|
222
|
+
if (/5\.[5-6]|7\.0/.test(data['php_version'])) {
|
|
223
|
+
data['version'] = '1.9.3';
|
|
224
|
+
} else if (/7\.[1-4]|8\.0/.test(data['php_version'])) {
|
|
225
|
+
data['version'] = '1.22.0';
|
|
226
|
+
}
|
|
226
227
|
}
|
|
227
228
|
data['url'] = await getPharUrl(data);
|
|
228
229
|
return addArchive(data);
|
package/src/utils.ts
CHANGED
|
@@ -320,7 +320,14 @@ export async function getCommand(os: string, suffix: string): Promise<string> {
|
|
|
320
320
|
case 'darwin':
|
|
321
321
|
return 'add_' + suffix + ' ';
|
|
322
322
|
case 'win32':
|
|
323
|
-
return
|
|
323
|
+
return (
|
|
324
|
+
'Add-' +
|
|
325
|
+
suffix
|
|
326
|
+
.split('_')
|
|
327
|
+
.map((part: string) => part.charAt(0).toUpperCase() + part.slice(1))
|
|
328
|
+
.join('') +
|
|
329
|
+
' '
|
|
330
|
+
);
|
|
324
331
|
default:
|
|
325
332
|
return await log('Platform ' + os + ' is not supported', os, 'error');
|
|
326
333
|
}
|