setup-php 2.18.0 → 2.19.1

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.
Files changed (21) hide show
  1. package/LICENSE +1 -1
  2. package/README.md +22 -11
  3. package/lib/extensions.js +3 -3
  4. package/lib/extensions.js.map +1 -1
  5. package/lib/fetch.js.map +1 -1
  6. package/lib/tools.js +35 -16
  7. package/lib/tools.js.map +1 -1
  8. package/package.json +18 -19
  9. package/src/configs/brew_extensions +2 -0
  10. package/src/extensions.ts +3 -3
  11. package/src/fetch.ts +2 -1
  12. package/src/scripts/darwin.sh +6 -5
  13. package/src/scripts/extensions/add_extensions.sh +12 -11
  14. package/src/scripts/extensions/couchbase.sh +64 -31
  15. package/src/scripts/extensions/sqlsrv.sh +9 -0
  16. package/src/scripts/tools/add_tools.ps1 +8 -1
  17. package/src/scripts/tools/add_tools.sh +9 -1
  18. package/src/scripts/tools/protoc.ps1 +2 -2
  19. package/src/scripts/tools/protoc.sh +2 -2
  20. package/src/scripts/unix.sh +4 -4
  21. package/src/tools.ts +37 -10
package/LICENSE CHANGED
@@ -1,7 +1,7 @@
1
1
 
2
2
  The MIT License (MIT)
3
3
 
4
- Copyright (c) 2019-2021 shivammathur and contributors
4
+ Copyright (c) shivammathur and contributors
5
5
 
6
6
  Permission is hereby granted, free of charge, to any person obtaining a copy
7
7
  of this software and associated documentation files (the "Software"), to deal
package/README.md CHANGED
@@ -68,25 +68,26 @@ Both `GitHub-hosted` and `self-hosted` runners are supported by `setup-php` on t
68
68
 
69
69
  ### GitHub-Hosted Runners
70
70
 
71
- | Virtual environment | YAML workflow label | Pre-installed PHP |
72
- |-----------------------|------------------------------------|------------------------|
73
- | Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | `PHP 7.4` to `PHP 8.1` |
74
- | Ubuntu 18.04 | `ubuntu-18.04` | `PHP 7.1` to `PHP 8.1` |
75
- | Windows Server 2022 | `windows-latest` or `windows-2022` | `PHP 8.1` |
76
- | Windows Server 2019 | `windows-2019` | `PHP 8.1` |
77
- | macOS Big Sur 11.x | `macos-11` | `PHP 8.1` |
78
- | macOS Catalina 10.15 | `macos-latest` or `macos-10.15` | `PHP 8.1` |
71
+ | Virtual environment | YAML workflow label | Pre-installed PHP |
72
+ |----------------------|------------------------------------|------------------------|
73
+ | Ubuntu 22.04 | `ubuntu-22.04` | `PHP 8.1` |
74
+ | Ubuntu 20.04 | `ubuntu-latest` or `ubuntu-20.04` | `PHP 7.4` to `PHP 8.1` |
75
+ | Ubuntu 18.04 | `ubuntu-18.04` | `PHP 7.2` to `PHP 8.1` |
76
+ | Windows Server 2022 | `windows-latest` or `windows-2022` | `PHP 8.1` |
77
+ | Windows Server 2019 | `windows-2019` | `PHP 8.1` |
78
+ | macOS Monterey 12.x | `macos-12` | `PHP 8.1` |
79
+ | macOS Big Sur 11.x | `macos-latest` or `macos-11` | `PHP 8.1` |
80
+ | macOS Catalina 10.15 | `macos-10.15` | `PHP 8.1` |
79
81
 
80
82
  ### Self-Hosted Runners
81
83
 
82
84
  | Host OS/Virtual environment | YAML workflow label |
83
85
  |----------------------------------|----------------------------|
84
- | Ubuntu 21.04 | `self-hosted` or `Linux` |
86
+ | Ubuntu 22.04 | `self-hosted` or `Linux` |
85
87
  | Ubuntu 20.04 | `self-hosted` or `Linux` |
86
88
  | Ubuntu 18.04 | `self-hosted` or `Linux` |
87
89
  | Debian 11 | `self-hosted` or `Linux` |
88
90
  | Debian 10 | `self-hosted` or `Linux` |
89
- | Debian 9 | `self-hosted` or `Linux` |
90
91
  | Windows 7 and newer | `self-hosted` or `Windows` |
91
92
  | Windows Server 2012 R2 and newer | `self-hosted` or `Windows` |
92
93
  | macOS Monterey 12.x x86_64/arm64 | `self-hosted` or `macOS` |
@@ -661,12 +662,15 @@ jobs:
661
662
 
662
663
  Run the workflow locally with `act` using [`shivammathur/node`](https://github.com/shivammathur/node-docker "Docker image to run setup-php") docker images.
663
664
 
664
- Choose the image tag which matches the `runs-on` property in your workflow. For example, if you are using `ubuntu-20.04` in your workflow, run `act -P ubuntu-20.04=shivammathur/node:20.04`.
665
+ Choose the image tag which matches the `runs-on` property in your workflow. For example, if you are using `ubuntu-20.04` in your workflow, run `act -P ubuntu-20.04=shivammathur/node:2004`.
665
666
 
666
667
  ```bash
667
668
  # For runs-on: ubuntu-latest
668
669
  act -P ubuntu-latest=shivammathur/node:latest
669
670
 
671
+ # For runs-on: ubuntu-22.04
672
+ act -P ubuntu-22.04=shivammathur/node:2204
673
+
670
674
  # For runs-on: ubuntu-20.04
671
675
  act -P ubuntu-20.04=shivammathur/node:2004
672
676
 
@@ -921,6 +925,13 @@ These companies generously provide setup-php their products and services to aid
921
925
  <a href="https://tidelift.com/subscription/pkg/npm-setup-php">
922
926
  <img src="https://setup-php.com/sponsors/tidelift.png" alt="Tidelift" width="70" height="60">
923
927
  </a>
928
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
929
+ <a href="https://www.scaleway.com/en/about-us/open-source-program#gh-light-mode-only">
930
+ <img src="https://setup-php.com/sponsors/scaleway.png" alt="Scaleway" width="174" height="60">
931
+ </a>
932
+ <a href="https://www.scaleway.com/en/about-us/open-source-program#gh-dark-mode-only">
933
+ <img src="https://setup-php.com/sponsors/scaleway-white.png" alt="Scaleway" width="174" height="60">
934
+ </a>
924
935
  </p>
925
936
 
926
937
  ## :package: Dependencies
package/lib/extensions.js CHANGED
@@ -44,7 +44,7 @@ async function addExtensionDarwin(extension_csv, version) {
44
44
  add_script += await utils.parseExtensionSource(extension, ext_prefix);
45
45
  return;
46
46
  case /^(5\.[3-6]|7\.[0-4]|8\.[0-1])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
47
- case /^couchbase$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(extension):
47
+ case /^couchbase|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(extension):
48
48
  case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
49
49
  case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4/.test(version_extension):
50
50
  case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
@@ -59,7 +59,7 @@ async function addExtensionDarwin(extension_csv, version) {
59
59
  case /(5\.[3-6]|7\.0)pcov/.test(version_extension):
60
60
  add_script += await utils.getUnsupportedLog('pcov', version, 'darwin');
61
61
  return;
62
- case /(?<!5\.[3-5])(amqp|apcu|expect|gnupg|grpc|igbinary|imagick|imap|mailparse|memcache|memcached|mongodb|msgpack|protobuf|psr|raphf|rdkafka|redis|ssh2|swoole|xdebug|xdebug2|yaml|zmq)/.test(version_extension):
62
+ case /(?<!5\.[3-5])(amqp|apcu|expect|gnupg|grpc|igbinary|imagick|imap|mailparse|mcrypt|memcache|memcached|mongodb|msgpack|protobuf|psr|raphf|rdkafka|redis|ssh2|swoole|xdebug|xdebug2|yaml|zmq)/.test(version_extension):
63
63
  case /(5\.6|7\.[0-4])propro/.test(version_extension):
64
64
  case /(?<!5\.[3-6]|7\.0)pcov/.test(version_extension):
65
65
  case /(?<!5\.[3-6])(vips|xlswriter)/.test(version_extension):
@@ -158,7 +158,7 @@ async function addExtensionLinux(extension_csv, version) {
158
158
  return;
159
159
  case /^(5\.[3-6]|7\.[0-4]|8\.[0-1])blackfire(-\d+\.\d+\.\d+)?$/.test(version_extension):
160
160
  case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(version_extension):
161
- case /^couchbase$|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(extension):
161
+ case /^couchbase|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(extension):
162
162
  case /(?<!5\.[3-5])intl-[\d]+\.[\d]+$/.test(version_extension):
163
163
  case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
164
164
  case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$/.test(version_extension):
package/lib/extensions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"extensions.js","sourceRoot":"","sources":["../src/extensions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"extensions.js","sourceRoot":"","sources":["../src/extensions.ts"],"names":[],"mappings":"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"}
package/lib/fetch.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAA+B;AAC/B,yCAA2B;AAQpB,KAAK,UAAU,KAAK,CACzB,SAAiB,EACjB,UAAmB,EACnB,cAAc,GAAG,CAAC;IAElB,MAAM,aAAa,GAAoC,IAAI,OAAO,CAChE,OAAO,CAAC,EAAE;QACR,MAAM,UAAU,GAAkB,IAAI,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,OAAO,GAAwB;YACnC,YAAY,EAAE,gBAAgB,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,aAAa;SAC5E,CAAC;QACF,IAAI,UAAU,EAAE;YACd,OAAO,CAAC,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC;SAChD;QACD,MAAM,OAAO,GAAyB;YACpC,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,IAAI,EAAE,UAAU,CAAC,QAAQ;YACzB,OAAO,EAAE,OAAO;SACjB,CAAC;QACF,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAoB,EAAE,EAAE;YACtD,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;gBAC1B,IAAI,IAAI,GAAG,EAAE,CAAC;gBACd,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBACxB,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC;gBACzC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,GAAG,IAAI,EAAE,EAAC,CAAC,CAAC,CAAC;aACjD;iBAAM,IACL,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAoB,CAAC,EAC5D;gBACA,IAAI,cAAc,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE;oBAC9C,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,CAAC,IAAI,CAC5D,OAAO,CACR,CAAC;iBACH;qBAAM;oBACL,OAAO,CAAC,EAAC,KAAK,EAAE,GAAG,GAAG,CAAC,UAAU,kBAAkB,EAAC,CAAC,CAAC;iBACvD;aACF;iBAAM;gBACL,OAAO,CAAC,EAAC,KAAK,EAAE,GAAG,GAAG,CAAC,UAAU,KAAK,GAAG,CAAC,aAAa,EAAE,EAAC,CAAC,CAAC;aAC7D;QACH,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC,CACF,CAAC;IACF,OAAO,MAAM,aAAa,CAAC;AAC7B,CAAC;AA3CD,sBA2CC"}
1
+ {"version":3,"file":"fetch.js","sourceRoot":"","sources":["../src/fetch.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AACA,6CAA+B;AAC/B,yCAA2B;AASpB,KAAK,UAAU,KAAK,CACzB,SAAiB,EACjB,UAAmB,EACnB,cAAc,GAAG,CAAC;IAElB,MAAM,aAAa,GAAoC,IAAI,OAAO,CAChE,OAAO,CAAC,EAAE;QACR,MAAM,UAAU,GAAkB,IAAI,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzD,MAAM,OAAO,GAAwB;YACnC,YAAY,EAAE,gBAAgB,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,aAAa;SAC5E,CAAC;QACF,IAAI,UAAU,EAAE;YACd,OAAO,CAAC,aAAa,GAAG,SAAS,GAAG,UAAU,CAAC;SAChD;QACD,MAAM,OAAO,GAAyB;YACpC,QAAQ,EAAE,UAAU,CAAC,QAAQ;YAC7B,IAAI,EAAE,UAAU,CAAC,QAAQ;YACzB,OAAO,EAAE,OAAO;SACjB,CAAC;QACF,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,GAAoB,EAAE,EAAE;YACtD,IAAI,GAAG,CAAC,UAAU,KAAK,GAAG,EAAE;gBAC1B,IAAI,IAAI,GAAG,EAAE,CAAC;gBACd,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBACxB,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC;gBACzC,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,EAAC,IAAI,EAAE,GAAG,IAAI,EAAE,EAAC,CAAC,CAAC,CAAC;aACjD;iBAAM,IACL,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAoB,CAAC,EAC5D;gBACA,IAAI,cAAc,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE;oBAC9C,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC,CAAC,IAAI,CAC5D,OAAO,CACR,CAAC;iBACH;qBAAM;oBACL,OAAO,CAAC,EAAC,KAAK,EAAE,GAAG,GAAG,CAAC,UAAU,kBAAkB,EAAC,CAAC,CAAC;iBACvD;aACF;iBAAM;gBACL,OAAO,CAAC,EAAC,KAAK,EAAE,GAAG,GAAG,CAAC,UAAU,KAAK,GAAG,CAAC,aAAa,EAAE,EAAC,CAAC,CAAC;aAC7D;QACH,CAAC,CAAC,CAAC;QACH,GAAG,CAAC,GAAG,EAAE,CAAC;IACZ,CAAC,CACF,CAAC;IACF,OAAO,MAAM,aAAa,CAAC;AAC7B,CAAC;AA3CD,sBA2CC"}
package/lib/tools.js CHANGED
@@ -32,13 +32,12 @@ const fs_1 = __importDefault(require("fs"));
32
32
  const fetch = __importStar(require("./fetch"));
33
33
  const utils = __importStar(require("./utils"));
34
34
  async function getSemverVersion(data) {
35
- var _a;
36
35
  const search = data['version_prefix'] + data['version'];
37
36
  const url = `https://api.github.com/repos/${data['repository']}/git/matching-refs/tags%2F${search}.`;
38
37
  const token = await utils.readEnv('COMPOSER_TOKEN');
39
38
  const response = await fetch.fetch(url, token);
40
39
  if (response.error || response.data === '[]') {
41
- data['error'] = (_a = response.error) !== null && _a !== void 0 ? _a : `No version found with prefix ${search}.`;
40
+ data['error'] = response.error ?? `No version found with prefix ${search}.`;
42
41
  return data['version'];
43
42
  }
44
43
  else {
@@ -174,22 +173,34 @@ async function addBlackfirePlayer(data) {
174
173
  }
175
174
  exports.addBlackfirePlayer = addBlackfirePlayer;
176
175
  async function addComposer(data) {
176
+ const channel = data['version'].replace('latest', 'stable');
177
177
  const github = data['github'];
178
178
  const getcomposer = data['domain'];
179
- let cache_url = `${github}/shivammathur/composer-cache/releases/latest/download/composer-${data['php_version']}-${data['version'].replace('latest', 'stable')}.phar`;
179
+ const cds = 'https://dl.cloudsmith.io';
180
+ const filename = `composer-${data['php_version']}-${channel}.phar`;
181
+ const releases_url = `${github}/shivammathur/composer-cache/releases/latest/download/${filename}`;
182
+ const cds_url = `${cds}/public/shivammathur/composer-cache/raw/files/${filename}`;
183
+ const lts_url = `${getcomposer}/download/latest-2.2.x/composer.phar`;
184
+ const is_lts = /^5\.[3-6]$|^7\.[0-1]$/.test(data['php_version']);
185
+ const version_source_url = `${getcomposer}/composer-${channel}.phar`;
186
+ let cache_url = `${releases_url},${cds_url}`;
180
187
  let source_url = `${getcomposer}/composer.phar`;
181
188
  switch (true) {
182
- case /^snapshot$/.test(data['version']):
189
+ case /^snapshot$/.test(channel):
190
+ source_url = is_lts ? lts_url : source_url;
183
191
  break;
184
- case /^preview$|^[1-2]$/.test(data['version']):
185
- source_url = `${getcomposer}/composer-${data['version']}.phar`;
192
+ case /^preview$|^2$/.test(channel):
193
+ source_url = is_lts ? lts_url : version_source_url;
194
+ break;
195
+ case /^1$/.test(channel):
196
+ source_url = version_source_url;
186
197
  break;
187
198
  case /^\d+\.\d+\.\d+[\w-]*$/.test(data['version']):
188
199
  cache_url = `${github}/${data['repository']}/releases/download/${data['version']}/composer.phar`;
189
- source_url = `${getcomposer}/composer-${data['version']}.phar`;
200
+ source_url = version_source_url;
190
201
  break;
191
202
  default:
192
- source_url = `${getcomposer}/composer-stable.phar`;
203
+ source_url = is_lts ? lts_url : version_source_url;
193
204
  }
194
205
  const use_cache = (await utils.readEnv('NO_TOOLS_CACHE')) !== 'true';
195
206
  data['url'] = use_cache ? `${cache_url},${source_url}` : source_url;
@@ -202,8 +213,17 @@ async function addDeployer(data) {
202
213
  data['url'] = data['domain'] + '/deployer.phar';
203
214
  }
204
215
  else {
205
- data['url'] =
206
- data['domain'] + '/releases/v' + data['version'] + '/deployer.phar';
216
+ const manifest = await fetch.fetch('https://deployer.org/manifest.json');
217
+ const version_data = JSON.parse(manifest.data);
218
+ const version_key = Object.keys(version_data).find((key) => {
219
+ return version_data[key]['version'] === data['version'];
220
+ });
221
+ if (version_key) {
222
+ data['url'] = version_data[version_key]['url'];
223
+ }
224
+ else {
225
+ return await utils.addLog('$cross', 'deployer', 'Version missing in deployer manifest', data['os']);
226
+ }
207
227
  }
208
228
  return await addArchive(data);
209
229
  }
@@ -276,7 +296,6 @@ async function addWPCLI(data) {
276
296
  }
277
297
  exports.addWPCLI = addWPCLI;
278
298
  async function getData(release, php_version, os) {
279
- var _a, _b, _c, _d, _e;
280
299
  const json_file_path = path_1.default.join(__dirname, '../src/configs/tools.json');
281
300
  const json_file = fs_1.default.readFileSync(json_file_path, 'utf8');
282
301
  const json_objects = JSON.parse(json_file);
@@ -307,16 +326,16 @@ async function getData(release, php_version, os) {
307
326
  }
308
327
  }
309
328
  data['github'] = 'https://github.com';
310
- (_a = data['domain']) !== null && _a !== void 0 ? _a : (data['domain'] = data['github']);
311
- (_b = data['extension']) !== null && _b !== void 0 ? _b : (data['extension'] = '.phar');
329
+ data['domain'] ??= data['github'];
330
+ data['extension'] ??= '.phar';
312
331
  data['os'] = os;
313
332
  data['php_version'] = php_version;
314
333
  data['prefix'] = data['github'] === data['domain'] ? 'releases' : '';
315
334
  data['verb'] = data['github'] === data['domain'] ? 'download' : '';
316
- (_c = data['fetch_latest']) !== null && _c !== void 0 ? _c : (data['fetch_latest'] = 'false');
317
- (_d = data['scope']) !== null && _d !== void 0 ? _d : (data['scope'] = 'global');
335
+ data['fetch_latest'] ??= 'false';
336
+ data['scope'] ??= 'global';
318
337
  data['version_parameter'] = JSON.stringify(data['version_parameter']) || '';
319
- (_e = data['version_prefix']) !== null && _e !== void 0 ? _e : (data['version_prefix'] = '');
338
+ data['version_prefix'] ??= '';
320
339
  data['release'] = await getRelease(release, data);
321
340
  data['version'] = version
322
341
  ? await getVersion(version, 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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "setup-php",
3
- "version": "2.18.0",
3
+ "version": "2.19.1",
4
4
  "private": false,
5
5
  "description": "Setup PHP for use with GitHub Actions",
6
6
  "main": "lib/install.js",
@@ -34,29 +34,28 @@
34
34
  "author": "shivammathur",
35
35
  "license": "MIT",
36
36
  "dependencies": {
37
- "@actions/core": "^1.6.0",
37
+ "@actions/core": "^1.8.2",
38
38
  "@actions/exec": "^1.1.1",
39
- "@actions/io": "^1.1.2",
40
- "fs": "0.0.1-security"
39
+ "@actions/io": "^1.1.2"
41
40
  },
42
41
  "devDependencies": {
43
- "@types/jest": "^27.4.1",
44
- "@types/node": "^17.0.22",
45
- "@typescript-eslint/eslint-plugin": "^5.16.0",
46
- "@typescript-eslint/parser": "^5.16.0",
47
- "@vercel/ncc": "^0.33.3",
48
- "eslint": "^8.11.0",
42
+ "@types/jest": "^28.1.1",
43
+ "@types/node": "^17.0.40",
44
+ "@typescript-eslint/eslint-plugin": "^5.27.0",
45
+ "@typescript-eslint/parser": "^5.27.0",
46
+ "@vercel/ncc": "^0.34.0",
47
+ "eslint": "^8.17.0",
49
48
  "eslint-config-prettier": "^8.5.0",
50
- "eslint-plugin-import": "^2.25.4",
51
- "eslint-plugin-jest": "^26.1.2",
49
+ "eslint-plugin-import": "^2.26.0",
50
+ "eslint-plugin-jest": "^26.5.3",
52
51
  "eslint-plugin-prettier": "^4.0.0",
53
- "jest": "^27.5.1",
54
- "jest-circus": "^27.5.1",
55
- "nock": "^13.2.4",
56
- "prettier": "^2.6.0",
57
- "simple-git-hooks": "^2.7.0",
58
- "ts-jest": "^27.1.3",
59
- "typescript": "^4.6.2"
52
+ "jest": "^28.1.0",
53
+ "jest-circus": "^28.1.0",
54
+ "nock": "^13.2.6",
55
+ "prettier": "^2.6.2",
56
+ "simple-git-hooks": "^2.8.0",
57
+ "ts-jest": "^28.0.4",
58
+ "typescript": "^4.7.3"
60
59
  },
61
60
  "bugs": {
62
61
  "url": "https://github.com/shivammathur/setup-php/issues"
package/src/configs/brew_extensions CHANGED
@@ -1,5 +1,6 @@
1
1
  amqp=amqp
2
2
  apcu=apcu
3
+ couchbase=couchbase
3
4
  expect=expect
4
5
  gnupg=gnupg
5
6
  grpc=grpc
@@ -7,6 +8,7 @@ igbinary=igbinary
7
8
  imagick=imagick
8
9
  imap=imap
9
10
  mailparse=mailparse
11
+ mcrypt=mcrypt
10
12
  memcache=memcache
11
13
  memcached=memcached
12
14
  mongodb=mongodb
package/src/extensions.ts CHANGED
@@ -39,7 +39,7 @@ export async function addExtensionDarwin(
39
39
  case /^(5\.[3-6]|7\.[0-4]|8\.[0-1])blackfire(-\d+\.\d+\.\d+)?$/.test(
40
40
  version_extension
41
41
  ):
42
- case /^couchbase$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
42
+ case /^couchbase|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
43
43
  extension
44
44
  ):
45
45
  case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
@@ -78,7 +78,7 @@ export async function addExtensionDarwin(
78
78
  // match 7.1 and newer - pcov
79
79
  // match 5.6 to 7.4 - propro
80
80
  // match 7.0 and newer - vips, xlswriter
81
- case /(?<!5\.[3-5])(amqp|apcu|expect|gnupg|grpc|igbinary|imagick|imap|mailparse|memcache|memcached|mongodb|msgpack|protobuf|psr|raphf|rdkafka|redis|ssh2|swoole|xdebug|xdebug2|yaml|zmq)/.test(
81
+ case /(?<!5\.[3-5])(amqp|apcu|expect|gnupg|grpc|igbinary|imagick|imap|mailparse|mcrypt|memcache|memcached|mongodb|msgpack|protobuf|psr|raphf|rdkafka|redis|ssh2|swoole|xdebug|xdebug2|yaml|zmq)/.test(
82
82
  version_extension
83
83
  ):
84
84
  case /(5\.6|7\.[0-4])propro/.test(version_extension):
@@ -262,7 +262,7 @@ export async function addExtensionLinux(
262
262
  case /^((5\.[3-6])|(7\.[0-2]))pdo_cubrid$|^((5\.[3-6])|(7\.[0-4]))cubrid$/.test(
263
263
  version_extension
264
264
  ):
265
- case /^couchbase$|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
265
+ case /^couchbase|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
266
266
  extension
267
267
  ):
268
268
  case /(?<!5\.[3-5])intl-[\d]+\.[\d]+$/.test(version_extension):
package/src/fetch.ts CHANGED
@@ -3,10 +3,11 @@ import * as https from 'https';
3
3
  import * as url from 'url';
4
4
 
5
5
  /**
6
- * Function to fetch an URL
6
+ * Function to fetch a URL
7
7
  *
8
8
  * @param input_url
9
9
  * @param auth_token
10
+ * @param redirect_count
10
11
  */
11
12
  export async function fetch(
12
13
  input_url: string,
package/src/scripts/darwin.sh CHANGED
@@ -79,6 +79,7 @@ copy_brew_extensions() {
79
79
  extension_file="$brew_prefix/opt/$dependency/$(get_extension_from_formula "${dependency%@*}").so"
80
80
  [ -e "$extension_file" ] && sudo cp "$extension_file" "$ext_dir"
81
81
  done
82
+ sudo find -- "$brew_prefix"/Cellar/"$formula"@"$version" -name "*.dylib" -exec cp {} "$ext_dir" \;
82
83
  }
83
84
 
84
85
  # Function to install a php extension from shivammathur/extensions tap.
@@ -95,7 +96,7 @@ add_brew_extension() {
95
96
  sudo mv "$tap_dir"/"$ext_tap"/.github/deps/"$formula"/* "$core_repo/Formula/" 2>/dev/null || true
96
97
  update_dependencies >/dev/null 2>&1
97
98
  disable_dependency_extensions "$extension" >/dev/null 2>&1
98
- brew install -f "$formula@$version" >/dev/null 2>&1
99
+ brew install -f "$ext_tap/$formula@$version" >/dev/null 2>&1
99
100
  copy_brew_extensions "$formula"
100
101
  add_extension_log "$extension" "Installed and enabled"
101
102
  fi
@@ -142,10 +143,10 @@ link_libraries() {
142
143
  # Patch brew to overwrite packages.
143
144
  patch_brew() {
144
145
  formula_installer="$brew_repo"/Library/Homebrew/formula_installer.rb
145
- code=" keg.link(verbose: verbose?"
146
- sudo sed -i '' "s/$code)/$code, overwrite: true)/" "$formula_installer"
146
+ code=" keg.link\(verbose: verbose\?"
147
+ sudo sed -Ei '' "s/$code.*/$code, overwrite: true\)/" "$formula_installer"
147
148
  # shellcheck disable=SC2064
148
- trap "sudo sed -i '' 's/$code, overwrite: true)/$code)/' $formula_installer" exit
149
+ trap "sudo sed -Ei '' 's/$code.*/$code, overwrite: overwrite?\)/' $formula_installer" exit
149
150
  }
150
151
 
151
152
  # Helper function to update the dependencies.
@@ -157,9 +158,9 @@ update_dependencies_helper() {
157
158
 
158
159
  # Function to update dependencies.
159
160
  update_dependencies() {
161
+ patch_brew
160
162
  if ! [ -e /tmp/update_dependencies ]; then
161
163
  if [ "${runner:?}" != "self-hosted" ] && [ "${ImageOS:-}" != "" ] && [ "${ImageVersion:-}" != "" ]; then
162
- patch_brew
163
164
  while read -r dependency; do
164
165
  update_dependencies_helper "$dependency" &
165
166
  to_wait+=($!)
package/src/scripts/extensions/add_extensions.sh CHANGED
@@ -30,7 +30,8 @@ enable_cache_extension_dependencies() {
30
30
  cache_dir=$(find /tmp/extcache -maxdepth 1 -type d -regex ".*$1[0-9]*")
31
31
  if [[ -n "$cache_dir" ]]; then
32
32
  IFS=" " read -r -a deps <<<"$(find "$cache_dir" -maxdepth 1 -type f -name "*" -exec basename {} \; | tr '\n' ' ')"
33
- if [[ -n "${deps[*]}" ]] && php "${deps[@]/#/-d ${2}=}" -d "${2}=$1" -m 2>/dev/null | grep -i -q "$1"; then
33
+ IFS="#" read -r -a deps_enable <<<"$(printf -- "-d ${2}=%s.so#" "${deps[@]}")"
34
+ if [[ -n "${deps[*]}" ]] && php "${deps_enable[@]}" -d "${2}=$1.so" -m 2>/dev/null | grep -i -q "$1"; then
34
35
  for ext in "${deps[@]}"; do
35
36
  sudo rm -rf /tmp/extcache/"$ext"
36
37
  enable_extension "$ext" "$2"
@@ -157,10 +158,16 @@ get_pecl_version() {
157
158
  pecl_install() {
158
159
  local extension=$1
159
160
  add_pecl >/dev/null 2>&1
160
- ncpu="$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo '1')"
161
- prefix_opts="$(parse_args "$extension" CONFIGURE_PREFIX_OPTS) MAKEFLAGS='-j $ncpu'"
161
+ cpu_count="$(nproc 2>/dev/null || sysctl -n hw.ncpu 2>/dev/null || echo '1')"
162
+ prefix_opts="$(parse_args "$extension" CONFIGURE_PREFIX_OPTS) MAKEFLAGS='-j $cpu_count'"
162
163
  suffix_opts="$(parse_args "$extension" CONFIGURE_OPTS) $(parse_args "$extension" CONFIGURE_SUFFIX_OPTS)"
163
- yes '' 2>/dev/null | sudo "$prefix_opts" pecl install -f -D "$(parse_pecl_configure_options "$suffix_opts")" "$extension" >/dev/null 2>&1
164
+ IFS=' ' read -r -a libraries <<<"$(parse_args "$extension" LIBS) $(parse_args "$extension" "$(uname -s)"_LIBS)"
165
+ (( ${#libraries[@]} )) && add_libs "${libraries[@]}" >/dev/null 2>&1
166
+ if [ "$version" = "5.3" ]; then
167
+ yes '' 2>/dev/null | sudo "$prefix_opts" pecl install -f "$extension" >/dev/null 2>&1
168
+ else
169
+ yes '' 2>/dev/null | sudo "$prefix_opts" pecl install -f -D "$(parse_pecl_configure_options "$suffix_opts")" "$extension" >/dev/null 2>&1
170
+ fi
164
171
  }
165
172
 
166
173
  # Function to install a specific version of PECL extension.
@@ -168,7 +175,6 @@ add_pecl_extension() {
168
175
  local extension=$1
169
176
  local pecl_version=$2
170
177
  local prefix=$3
171
- local message="Installed and enabled"
172
178
  enable_extension "$extension" "$prefix"
173
179
  if [[ $pecl_version =~ .*(alpha|beta|rc|snapshot|preview).* ]]; then
174
180
  pecl_version=$(get_pecl_version "$extension" "$pecl_version")
@@ -177,14 +183,9 @@ add_pecl_extension() {
177
183
  if [ "${ext_version/-/}" = "$pecl_version" ]; then
178
184
  add_log "${tick:?}" "$extension" "Enabled"
179
185
  else
180
- IFS=' ' read -r -a libraries <<<"$(parse_args "$extension" LIBS) $(parse_args "$extension" "$(uname -s)"_LIBS)"
181
- if (( ${#libraries[@]} )); then
182
- add_libs "${libraries[@]}" >/dev/null 2>&1
183
- message="$message with libraries ${libraries[*]}"
184
- fi
185
186
  disable_extension_helper "$extension" >/dev/null 2>&1
186
187
  pecl_install "$extension-$pecl_version"
187
- add_extension_log "$extension-$pecl_version" "$message"
188
+ add_extension_log "$extension-$pecl_version" "Installed and enabled"
188
189
  fi
189
190
  }
190
191
 
package/src/scripts/extensions/couchbase.sh CHANGED
@@ -1,43 +1,76 @@
1
1
  # Function to install libraries required by couchbase
2
- add_couchbase_libs() {
3
- if [ "$(uname -s)" = "Linux" ]; then
4
- trunk="https://github.com/couchbase/libcouchbase/releases"
5
- if [[ ${version:?} =~ 5.[3-6]|7.[0-1] ]]; then
6
- release="2.10.9"
7
- else
8
- release="$(curl -sL $trunk/latest | grep -Eo "libcouchbase-[0-9]+\.[0-9]+\.[0-9]+" | head -n 1 | cut -d'-' -f 2)"
9
- fi
10
- deb_url="$trunk/download/$release/libcouchbase-${release}_ubuntu${VERSION_ID/./}_${VERSION_CODENAME}_amd64.tar"
11
- get -q -n /tmp/libcouchbase.tar "$deb_url"
12
- sudo tar -xf /tmp/libcouchbase.tar -C /tmp
13
- install_packages libev4 libevent-dev
14
- sudo dpkg -i /tmp/libcouchbase-*/*.deb
2
+ add_couchbase_clibs() {
3
+ ext=$1
4
+ trunk="https://github.com/couchbase/libcouchbase/releases"
5
+ if [[ "$ext" =~ couchbase-2.+ ]]; then
6
+ release="2.10.9"
15
7
  else
16
- if [[ ${version:?} =~ 5.[3-6]|7.[0-1] ]]; then
17
- brew install libcouchbase@2
18
- brew link --overwrite --force libcouchbase@2
19
- else
20
- brew install libcouchbase
8
+ release="$(curl -sL $trunk/latest | grep -Eo "libcouchbase-[0-9]+\.[0-9]+\.[0-9]+" | head -n 1 | cut -d'-' -f 2)"
9
+ fi
10
+ [ "$VERSION_ID" = "22.04" ] && vid=20.04 || vid="$VERSION_ID"
11
+ [ "$VERSION_CODENAME" = "jammy" ] && vcn=focal || vcn="$VERSION_CODENAME"
12
+ deb_url="$trunk/download/$release/libcouchbase-${release}_ubuntu${vid/./}_${vcn}_amd64.tar"
13
+ get -q -n /tmp/libcouchbase.tar "$deb_url"
14
+ sudo tar -xf /tmp/libcouchbase.tar -C /tmp
15
+ install_packages libev4 libevent-dev
16
+ sudo dpkg -i /tmp/libcouchbase-*/*.deb
17
+ }
18
+
19
+ add_couchbase_cxxlibs() {
20
+ if [ "$VERSION_ID" = "18.04" ]; then
21
+ if ! command -v gcc-8 >/dev/null || ! command -v g++-8 >/dev/null; then
22
+ install_packages gcc-8 g++-8 -y
21
23
  fi
24
+ printf "gcc g++" | xargs -d ' ' -I {} sudo update-alternatives --install /usr/bin/{} {} /usr/bin/{}-8 8
25
+ fi
26
+ if [ "${runner:?}" = "self-hosted" ]; then
27
+ add_list cmake https://apt.kitware.com/ubuntu/ https://apt.kitware.com/keys/kitware-archive-latest.asc "$VERSION_CODENAME" main
28
+ fi
29
+ install_packages cmake ccache
30
+ }
31
+
32
+ get_couchbase_version() {
33
+ if [[ "${version:?}" =~ ${old_versions:?} ]]; then
34
+ echo couchbase-2.2.3
35
+ elif [[ "${version:?}" =~ 5.6|7.[0-1] ]]; then
36
+ echo couchbase-2.6.2
37
+ elif [ "${version:?}" = '7.2' ]; then
38
+ echo couchbase-3.0.4
39
+ elif [ "${version:?}" = '7.3' ]; then
40
+ echo couchbase-3.2.2
41
+ else
42
+ echo couchbase
22
43
  fi
23
44
  }
24
45
 
25
46
  # Function to add couchbase.
26
47
  add_couchbase() {
27
- add_couchbase_libs >/dev/null 2>&1
28
- enable_extension "couchbase" "extension"
29
- if check_extension "couchbase"; then
30
- add_log "${tick:?}" "couchbase" "Enabled"
31
- else
32
- if [[ "${version:?}" =~ ${old_versions:?} ]]; then
33
- pecl_install couchbase-2.2.3 >/dev/null 2>&1
34
- elif [[ "${version:?}" =~ 5.6|7.[0-1] ]]; then
35
- pecl_install couchbase-2.6.2 >/dev/null 2>&1
36
- elif [[ "${version:?}" =~ 7.2 ]]; then
37
- pecl_install couchbase-3.0.4 >/dev/null 2>&1
48
+ ext=$1
49
+ if [ "$(uname -s)" = "Linux" ]; then
50
+ if [ "$ext" = "couchbase" ]; then
51
+ ext=$(get_couchbase_version)
52
+ fi
53
+ if [[ "$ext" =~ couchbase-[2-3].+ ]]; then
54
+ add_couchbase_clibs "$ext" >/dev/null 2>&1
38
55
  else
39
- pecl_install couchbase >/dev/null 2>&1
56
+ add_couchbase_cxxlibs >/dev/null 2>&1
57
+ fi
58
+ enable_extension "couchbase" "extension"
59
+ if check_extension "couchbase"; then
60
+ add_log "${tick:?}" "couchbase" "Enabled"
61
+ else
62
+ if [ "$ext" = "couchbase" ]; then
63
+ ext="couchbase-$(get_pecl_version "couchbase" "stable")"
64
+ add_extension_from_source couchbase https://pecl.php.net couchbase couchbase "${ext##*-}" extension pecl >/dev/null 2>&1
65
+ else
66
+ pecl_install "${ext}" >/dev/null 2>&1
67
+ fi
68
+ add_extension_log "couchbase" "Installed and enabled"
69
+ fi
70
+ else
71
+ if [ -e "${ext_dir:?}"/libcouchbase_php_core.dylib ]; then
72
+ sudo cp "${ext_dir:?}"/libcouchbase_php_core.dylib ${brew_prefix:?}/lib
40
73
  fi
41
- add_extension_log "couchbase" "Installed and enabled"
74
+ add_brew_extension couchbase extension
42
75
  fi
43
76
  }
package/src/scripts/extensions/sqlsrv.sh CHANGED
@@ -7,9 +7,18 @@ get_sqlsrv_version() {
7
7
  fi
8
8
  }
9
9
 
10
+ add_unixodbc() {
11
+ if [ "$(uname -s)" = 'Linux' ]; then
12
+ install_packages unixodbc-dev
13
+ else
14
+ brew install unixodbc
15
+ fi
16
+ }
17
+
10
18
  # Function to install sqlsrv and pdo_sqlsrv.
11
19
  add_sqlsrv() {
12
20
  ext=$1
13
21
  ext_version=$(get_sqlsrv_version)
22
+ add_unixodbc >/dev/null 2>&1
14
23
  add_pecl_extension "$ext" "$ext_version" extension
15
24
  }
package/src/scripts/tools/add_tools.ps1 CHANGED
@@ -37,7 +37,7 @@ Function Get-ToolVersion() {
37
37
  [Parameter(Position = 1, Mandatory = $true)]
38
38
  $param
39
39
  )
40
- $alp = "[a-zA-Z0-9]"
40
+ $alp = "[a-zA-Z0-9\.]"
41
41
  $version_regex = "[0-9]+((\.{1}$alp+)+)(\.{0})(-$alp+){0,1}"
42
42
  if($tool -eq 'composer') {
43
43
  $composer_branch_alias = Select-String -Pattern "const\sBRANCH_ALIAS_VERSION" -Path $bin_dir\composer -Raw | Select-String -Pattern $version_regex | ForEach-Object { $_.matches.Value }
@@ -67,6 +67,13 @@ Function Add-ToolsHelper() {
67
67
  Edit-ComposerConfig $bin_dir\$tool
68
68
  } elseif($tool -eq "cs2pr") {
69
69
  (Get-Content $bin_dir/cs2pr).replace('exit(9)', 'exit(0)') | Set-Content $bin_dir/cs2pr
70
+ } elseif($tool -eq "deployer") {
71
+ if(Test-Path $composer_bin\deployer.phar.bat) {
72
+ Copy-Item $composer_bin\deployer.phar.bat -Destination $composer_bin\dep.bat
73
+ }
74
+ if(Test-Path $composer_bin\dep.bat) {
75
+ Copy-Item $composer_bin\dep.bat -Destination $composer_bin\deployer.bat
76
+ }
70
77
  } elseif($tool -eq "phan") {
71
78
  $extensions += @('fileinfo', 'ast')
72
79
  } elseif($tool -eq "phinx") {
package/src/scripts/tools/add_tools.sh CHANGED
@@ -9,7 +9,7 @@ export composer_lock="$composer_home/composer.lock"
9
9
  get_tool_version() {
10
10
  tool=$1
11
11
  param=$2
12
- alp="[a-zA-Z0-9]"
12
+ alp="[a-zA-Z0-9\.]"
13
13
  version_regex="[0-9]+((\.{1}$alp+)+)(\.{0})(-$alp+){0,1}"
14
14
  if [ "$tool" = "composer" ]; then
15
15
  composer_alias_version="$(grep -Ea "const\sBRANCH_ALIAS_VERSION" "$tool_path_dir/composer" | grep -Eo "$version_regex")"
@@ -61,6 +61,13 @@ add_tools_helper() {
61
61
  elif [ "$tool" = "cs2pr" ]; then
62
62
  sudo sed -i 's/\r$//; s/exit(9)/exit(0)/' "$tool_path" 2>/dev/null ||
63
63
  sudo sed -i '' 's/\r$//; s/exit(9)/exit(0)/' "$tool_path"
64
+ elif [ "$tool" = "deployer" ]; then
65
+ if [ -e "$composer_bin"/deployer.phar ]; then
66
+ sudo ln -s "$composer_bin"/deployer.phar "$composer_bin"/dep
67
+ fi
68
+ if [ -e "$composer_bin"/dep ]; then
69
+ sudo ln -s "$composer_bin"/dep "$composer_bin"/deployer
70
+ fi
64
71
  elif [ "$tool" = "phan" ]; then
65
72
  extensions+=(fileinfo ast)
66
73
  elif [ "$tool" = "phinx" ]; then
@@ -142,6 +149,7 @@ add_composertool_helper() {
142
149
  scoped_dir="$composer_bin/_tools/$tool-$(echo -n "$release" | shasum -a 256 | cut -d ' ' -f 1)"
143
150
  if ! [ -d "$scoped_dir" ]; then
144
151
  mkdir -p "$scoped_dir"
152
+ echo '{}' | tee "$scoped_dir/composer.json" >/dev/null
145
153
  composer require "$prefix$release" -d "$scoped_dir" "$composer_args" >/dev/null 2>&1
146
154
  composer show "$prefix$tool" -d "$scoped_dir" 2>&1 | grep -E ^versions | sudo tee /tmp/composer.log >/dev/null 2>&1
147
155
  fi
package/src/scripts/tools/protoc.ps1 CHANGED
@@ -1,6 +1,6 @@
1
1
  Function Get-ProtobufTag() {
2
2
  if("$protobuf_tag" -eq "latest") {
3
- $protobuf_tag = (Invoke-RestMethod https://api.github.com/repos/protocolbuffers/protobuf/tags).Name | Where-Object { $_ -match "v\d+.\d+.\d+$" } | Select-Object -First 1
3
+ $protobuf_tag = (Invoke-RestMethod https://api.github.com/repos/protocolbuffers/protobuf/releases).tag_name | Where-Object { $_ -match "v\d+.\d+.\d+$" } | Select-Object -First 1
4
4
  } else {
5
5
  try {
6
6
  [net.httpWebRequest] $request = [net.webRequest]::create("https://github.com/protocolbuffers/protobuf/releases/tag/v$protobuf_tag")
@@ -9,7 +9,7 @@ Function Get-ProtobufTag() {
9
9
  $response.Close()
10
10
  $protobuf_tag = "v$protobuf_tag"
11
11
  } catch {
12
- $protobuf_tag = (Invoke-RestMethod https://api.github.com/repos/protocolbuffers/protobuf/tags).Name | Where-Object { $_ -match "v\d+.\d+.\d+$" } | Select-Object -First 1
12
+ $protobuf_tag = (Invoke-RestMethod https://api.github.com/repos/protocolbuffers/protobuf/releases).tag_name | Where-Object { $_ -match "v\d+.\d+.\d+$" } | Select-Object -First 1
13
13
  }
14
14
  }
15
15
  return $protobuf_tag
package/src/scripts/tools/protoc.sh CHANGED
@@ -1,12 +1,12 @@
1
1
  get_protobuf_tag() {
2
2
  if [ "$protobuf_tag" = "latest" ]; then
3
- protobuf_tag=$(get -s -n "" https://github.com/protocolbuffers/protobuf/releases/latest 2<&1 | grep -m 1 -Eo "(v[0-9]+\.[0-9]+\.[0-9]+)" | head -n 1)
3
+ protobuf_tag=$(get -s -n "" https://github.com/protocolbuffers/protobuf/releases/latest 2<&1 | grep -m 1 -Eo "tag/(v[0-9]+(\.[0-9]+)?(\.[0-9]+)?)" | head -n 1 | cut -d '/' -f 2)
4
4
  else
5
5
  status_code=$(get -v -n /tmp/protobuf.tmp "https://github.com/protocolbuffers/protobuf/releases/tag/v$protobuf_tag")
6
6
  if [ "$status_code" = "200" ]; then
7
7
  protobuf_tag="v$protobuf_tag"
8
8
  else
9
- protobuf_tag=$(get -s -n "" https://github.com/protocolbuffers/protobuf/releases/latest 2<&1 | grep -m 1 -Eo "(v[0-9]+\.[0-9]+\.[0-9]+)" | head -n 1)
9
+ protobuf_tag=$(get -s -n "" https://github.com/protocolbuffers/protobuf/releases/latest 2<&1 | grep -m 1 -Eo "tag/(v[0-9]+(\.[0-9]+)?(\.[0-9]+)?)" | head -n 1 | cut -d '/' -f 2)
10
10
  fi
11
11
  fi
12
12
  }
package/src/scripts/unix.sh CHANGED
@@ -159,10 +159,10 @@ self_hosted_setup() {
159
159
  configure_php() {
160
160
  add_php_config
161
161
  ini_config_dir="${src:?}"/configs/ini
162
- ini_files=("$ini_config_dir"/php.ini)
163
- [[ "$version" =~ $jit_versions ]] && ini_files+=("$ini_config_dir"/jit.ini)
164
- [[ "$version" =~ $xdebug3_versions ]] && ini_files+=("$ini_config_dir"/xdebug.ini)
165
- cat "${ini_files[@]}" | sudo tee -a "${pecl_file:-${ini_file[@]}}" >/dev/null 2>&1
162
+ ini_config_files=("$ini_config_dir"/php.ini)
163
+ [[ "$version" =~ $jit_versions ]] && ini_config_files+=("$ini_config_dir"/jit.ini)
164
+ [[ "$version" =~ $xdebug3_versions ]] && ini_config_files+=("$ini_config_dir"/xdebug.ini)
165
+ cat "${ini_config_files[@]}" | sudo tee -a "${ini_file[@]:?}" >/dev/null 2>&1
166
166
  }
167
167
 
168
168
  # Function to get PHP version in semver format.
package/src/tools.ts CHANGED
@@ -230,24 +230,34 @@ export async function addBlackfirePlayer(data: RS): Promise<string> {
230
230
  * @param data
231
231
  */
232
232
  export async function addComposer(data: RS): Promise<string> {
233
+ const channel = data['version'].replace('latest', 'stable');
233
234
  const github = data['github'];
234
235
  const getcomposer = data['domain'];
235
- let cache_url = `${github}/shivammathur/composer-cache/releases/latest/download/composer-${
236
- data['php_version']
237
- }-${data['version'].replace('latest', 'stable')}.phar`;
236
+ const cds = 'https://dl.cloudsmith.io';
237
+ const filename = `composer-${data['php_version']}-${channel}.phar`;
238
+ const releases_url = `${github}/shivammathur/composer-cache/releases/latest/download/${filename}`;
239
+ const cds_url = `${cds}/public/shivammathur/composer-cache/raw/files/${filename}`;
240
+ const lts_url = `${getcomposer}/download/latest-2.2.x/composer.phar`;
241
+ const is_lts = /^5\.[3-6]$|^7\.[0-1]$/.test(data['php_version']);
242
+ const version_source_url = `${getcomposer}/composer-${channel}.phar`;
243
+ let cache_url = `${releases_url},${cds_url}`;
238
244
  let source_url = `${getcomposer}/composer.phar`;
239
245
  switch (true) {
240
- case /^snapshot$/.test(data['version']):
246
+ case /^snapshot$/.test(channel):
247
+ source_url = is_lts ? lts_url : source_url;
241
248
  break;
242
- case /^preview$|^[1-2]$/.test(data['version']):
243
- source_url = `${getcomposer}/composer-${data['version']}.phar`;
249
+ case /^preview$|^2$/.test(channel):
250
+ source_url = is_lts ? lts_url : version_source_url;
251
+ break;
252
+ case /^1$/.test(channel):
253
+ source_url = version_source_url;
244
254
  break;
245
255
  case /^\d+\.\d+\.\d+[\w-]*$/.test(data['version']):
246
256
  cache_url = `${github}/${data['repository']}/releases/download/${data['version']}/composer.phar`;
247
- source_url = `${getcomposer}/composer-${data['version']}.phar`;
257
+ source_url = version_source_url;
248
258
  break;
249
259
  default:
250
- source_url = `${getcomposer}/composer-stable.phar`;
260
+ source_url = is_lts ? lts_url : version_source_url;
251
261
  }
252
262
  const use_cache: boolean = (await utils.readEnv('NO_TOOLS_CACHE')) !== 'true';
253
263
  data['url'] = use_cache ? `${cache_url},${source_url}` : source_url;
@@ -264,8 +274,25 @@ export async function addDeployer(data: RS): Promise<string> {
264
274
  if (data['version'] === 'latest') {
265
275
  data['url'] = data['domain'] + '/deployer.phar';
266
276
  } else {
267
- data['url'] =
268
- data['domain'] + '/releases/v' + data['version'] + '/deployer.phar';
277
+ const manifest: RS = await fetch.fetch(
278
+ 'https://deployer.org/manifest.json'
279
+ );
280
+ const version_data: RSRS = JSON.parse(manifest.data);
281
+ const version_key: string | undefined = Object.keys(version_data).find(
282
+ (key: string) => {
283
+ return version_data[key]['version'] === data['version'];
284
+ }
285
+ );
286
+ if (version_key) {
287
+ data['url'] = version_data[version_key]['url'];
288
+ } else {
289
+ return await utils.addLog(
290
+ '$cross',
291
+ 'deployer',
292
+ 'Version missing in deployer manifest',
293
+ data['os']
294
+ );
295
+ }
269
296
  }
270
297
  return await addArchive(data);
271
298
  }