setup-php 2.30.4 → 2.31.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.
Files changed (31) hide show
  1. package/README.md +7 -1
  2. package/lib/config.js +3 -4
  3. package/lib/config.js.map +1 -1
  4. package/lib/coverage.js +5 -6
  5. package/lib/coverage.js.map +1 -1
  6. package/lib/extensions.js +10 -11
  7. package/lib/extensions.js.map +1 -1
  8. package/lib/fetch.js +1 -2
  9. package/lib/fetch.js.map +1 -1
  10. package/lib/install.js +2 -3
  11. package/lib/install.js.map +1 -1
  12. package/lib/packagist.js +1 -2
  13. package/lib/packagist.js.map +1 -1
  14. package/lib/tools.js +22 -22
  15. package/lib/tools.js.map +1 -1
  16. package/lib/utils.js +23 -24
  17. package/lib/utils.js.map +1 -1
  18. package/package.json +8 -8
  19. package/src/configs/mod_priority +1 -0
  20. package/src/configs/tools.json +7 -1
  21. package/src/extensions.ts +12 -12
  22. package/src/scripts/darwin.sh +2 -2
  23. package/src/scripts/extensions/blackfire.sh +13 -5
  24. package/src/scripts/extensions/couchbase.sh +15 -3
  25. package/src/scripts/extensions/firebird.sh +7 -4
  26. package/src/scripts/extensions/ioncube.sh +16 -5
  27. package/src/scripts/extensions/oci.sh +4 -0
  28. package/src/scripts/extensions/phalcon.sh +5 -1
  29. package/src/scripts/extensions/relay.sh +8 -4
  30. package/src/scripts/linux.sh +13 -0
  31. package/src/scripts/tools/ppa.sh +32 -8
package/lib/utils.js CHANGED
@@ -26,7 +26,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
26
26
  return (mod && mod.__esModule) ? mod : { "default": mod };
27
27
  };
28
28
  Object.defineProperty(exports, "__esModule", { value: true });
29
- exports.setVariable = exports.readPHPVersion = exports.parseExtensionSource = exports.customPackage = exports.scriptTool = exports.scriptExtension = exports.joins = exports.getCommand = exports.getUnsupportedLog = exports.suppressOutput = exports.getExtensionPrefix = exports.CSVArray = exports.extensionArray = exports.addLog = exports.stepLog = exports.log = exports.color = exports.asyncForEach = exports.parseIniFile = exports.parseVersion = exports.getManifestURL = exports.getInput = exports.readEnv = void 0;
29
+ exports.readEnv = readEnv;
30
+ exports.getInput = getInput;
31
+ exports.getManifestURL = getManifestURL;
32
+ exports.parseVersion = parseVersion;
33
+ exports.parseIniFile = parseIniFile;
34
+ exports.asyncForEach = asyncForEach;
35
+ exports.color = color;
36
+ exports.log = log;
37
+ exports.stepLog = stepLog;
38
+ exports.addLog = addLog;
39
+ exports.extensionArray = extensionArray;
40
+ exports.CSVArray = CSVArray;
41
+ exports.getExtensionPrefix = getExtensionPrefix;
42
+ exports.suppressOutput = suppressOutput;
43
+ exports.getUnsupportedLog = getUnsupportedLog;
44
+ exports.getCommand = getCommand;
45
+ exports.joins = joins;
46
+ exports.scriptExtension = scriptExtension;
47
+ exports.scriptTool = scriptTool;
48
+ exports.customPackage = customPackage;
49
+ exports.parseExtensionSource = parseExtensionSource;
50
+ exports.readPHPVersion = readPHPVersion;
51
+ exports.setVariable = setVariable;
30
52
  const fs_1 = __importDefault(require("fs"));
31
53
  const path = __importStar(require("path"));
32
54
  const core = __importStar(require("@actions/core"));
@@ -41,7 +63,6 @@ async function readEnv(property) {
41
63
  process.env[property_uc.replace('_', '-')] ||
42
64
  '');
43
65
  }
44
- exports.readEnv = readEnv;
45
66
  async function getInput(name, mandatory) {
46
67
  const input = core.getInput(name);
47
68
  const env_input = await readEnv(name);
@@ -56,11 +77,9 @@ async function getInput(name, mandatory) {
56
77
  return '';
57
78
  }
58
79
  }
59
- exports.getInput = getInput;
60
80
  async function getManifestURL() {
61
81
  return 'https://raw.githubusercontent.com/shivammathur/setup-php/develop/src/configs/php-versions.json';
62
82
  }
63
- exports.getManifestURL = getManifestURL;
64
83
  async function parseVersion(version) {
65
84
  switch (true) {
66
85
  case /^(latest|lowest|highest|nightly|\d+\.x)$/.test(version):
@@ -74,7 +93,6 @@ async function parseVersion(version) {
74
93
  }
75
94
  }
76
95
  }
77
- exports.parseVersion = parseVersion;
78
96
  async function parseIniFile(ini_file) {
79
97
  switch (true) {
80
98
  case /^(production|development|none)$/.test(ini_file):
@@ -85,13 +103,11 @@ async function parseIniFile(ini_file) {
85
103
  return 'production';
86
104
  }
87
105
  }
88
- exports.parseIniFile = parseIniFile;
89
106
  async function asyncForEach(array, callback) {
90
107
  for (let index = 0; index < array.length; index++) {
91
108
  await callback(array[index], index, array);
92
109
  }
93
110
  }
94
- exports.asyncForEach = asyncForEach;
95
111
  async function color(type) {
96
112
  switch (type) {
97
113
  case 'error':
@@ -103,7 +119,6 @@ async function color(type) {
103
119
  return '33';
104
120
  }
105
121
  }
106
- exports.color = color;
107
122
  async function log(message, os, log_type) {
108
123
  switch (os) {
109
124
  case 'win32':
@@ -118,7 +133,6 @@ async function log(message, os, log_type) {
118
133
  return ('echo "\\033[' + (await color(log_type)) + ';1m' + message + '\\033[0m"');
119
134
  }
120
135
  }
121
- exports.log = log;
122
136
  async function stepLog(message, os) {
123
137
  switch (os) {
124
138
  case 'win32':
@@ -130,7 +144,6 @@ async function stepLog(message, os) {
130
144
  return await log('Platform ' + os + ' is not supported', os, 'error');
131
145
  }
132
146
  }
133
- exports.stepLog = stepLog;
134
147
  async function addLog(mark, subject, message, os) {
135
148
  switch (os) {
136
149
  case 'win32':
@@ -142,7 +155,6 @@ async function addLog(mark, subject, message, os) {
142
155
  return await log('Platform ' + os + ' is not supported', os, 'error');
143
156
  }
144
157
  }
145
- exports.addLog = addLog;
146
158
  async function extensionArray(extension_csv) {
147
159
  switch (extension_csv) {
148
160
  case '':
@@ -165,7 +177,6 @@ async function extensionArray(extension_csv) {
165
177
  ].filter(Boolean);
166
178
  }
167
179
  }
168
- exports.extensionArray = extensionArray;
169
180
  async function CSVArray(values_csv) {
170
181
  switch (values_csv) {
171
182
  case '':
@@ -185,7 +196,6 @@ async function CSVArray(values_csv) {
185
196
  .filter(Boolean);
186
197
  }
187
198
  }
188
- exports.CSVArray = CSVArray;
189
199
  async function getExtensionPrefix(extension) {
190
200
  switch (true) {
191
201
  default:
@@ -194,7 +204,6 @@ async function getExtensionPrefix(extension) {
194
204
  return 'zend_extension';
195
205
  }
196
206
  }
197
- exports.getExtensionPrefix = getExtensionPrefix;
198
207
  async function suppressOutput(os) {
199
208
  switch (os) {
200
209
  case 'win32':
@@ -206,13 +215,11 @@ async function suppressOutput(os) {
206
215
  return await log('Platform ' + os + ' is not supported', os, 'error');
207
216
  }
208
217
  }
209
- exports.suppressOutput = suppressOutput;
210
218
  async function getUnsupportedLog(extension, version, os) {
211
219
  return ('\n' +
212
220
  (await addLog('$cross', extension, [extension, 'is not supported on PHP', version].join(' '), os)) +
213
221
  '\n');
214
222
  }
215
- exports.getUnsupportedLog = getUnsupportedLog;
216
223
  async function getCommand(os, suffix) {
217
224
  switch (os) {
218
225
  case 'linux':
@@ -229,11 +236,9 @@ async function getCommand(os, suffix) {
229
236
  return await log('Platform ' + os + ' is not supported', os, 'error');
230
237
  }
231
238
  }
232
- exports.getCommand = getCommand;
233
239
  async function joins(...str) {
234
240
  return [...str].join(' ');
235
241
  }
236
- exports.joins = joins;
237
242
  async function scriptExtension(os) {
238
243
  switch (os) {
239
244
  case 'win32':
@@ -245,7 +250,6 @@ async function scriptExtension(os) {
245
250
  return await log('Platform ' + os + ' is not supported', os, 'error');
246
251
  }
247
252
  }
248
- exports.scriptExtension = scriptExtension;
249
253
  async function scriptTool(os) {
250
254
  switch (os) {
251
255
  case 'win32':
@@ -257,7 +261,6 @@ async function scriptTool(os) {
257
261
  return await log('Platform ' + os + ' is not supported', os, 'error');
258
262
  }
259
263
  }
260
- exports.scriptTool = scriptTool;
261
264
  async function customPackage(pkg, type, version, os) {
262
265
  const pkg_name = pkg.replace(/\d+|(pdo|pecl)[_-]/, '');
263
266
  const script_extension = await scriptExtension(os);
@@ -265,14 +268,12 @@ async function customPackage(pkg, type, version, os) {
265
268
  const command = await getCommand(os, pkg_name);
266
269
  return '\n. ' + script + '\n' + command + version;
267
270
  }
268
- exports.customPackage = customPackage;
269
271
  async function parseExtensionSource(extension, prefix) {
270
272
  const regex = /(\w+)-(\w+:\/\/.{1,253}(?:[.:][^:/\s]{2,63})+\/)?([\w.-]+)\/([\w.-]+)@(.+)/;
271
273
  const matches = regex.exec(extension);
272
274
  matches[2] = matches[2] ? matches[2].slice(0, -1) : 'https://github.com';
273
275
  return await joins('\nadd_extension_from_source', ...matches.splice(1, matches.length), prefix);
274
276
  }
275
- exports.parseExtensionSource = parseExtensionSource;
276
277
  async function readPHPVersion() {
277
278
  const version = await getInput('php-version', false);
278
279
  if (version) {
@@ -304,7 +305,6 @@ async function readPHPVersion() {
304
305
  }
305
306
  return 'latest';
306
307
  }
307
- exports.readPHPVersion = readPHPVersion;
308
308
  async function setVariable(variable, command, os) {
309
309
  switch (os) {
310
310
  case 'win32':
@@ -315,5 +315,4 @@ async function setVariable(variable, command, os) {
315
315
  return '\n' + variable + '="$(' + command + ')"\n';
316
316
  }
317
317
  }
318
- exports.setVariable = setVariable;
319
318
  //# sourceMappingURL=utils.js.map
package/lib/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
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.30.4",
3
+ "version": "2.31.0",
4
4
  "private": false,
5
5
  "description": "Setup PHP for use with GitHub Actions",
6
6
  "main": "lib/install.js",
@@ -41,22 +41,22 @@
41
41
  },
42
42
  "devDependencies": {
43
43
  "@types/jest": "^29.5.12",
44
- "@types/node": "^20.12.2",
45
- "@typescript-eslint/eslint-plugin": "^7.4.0",
46
- "@typescript-eslint/parser": "^7.4.0",
44
+ "@types/node": "^20.14.8",
45
+ "@typescript-eslint/eslint-plugin": "^7.13.1",
46
+ "@typescript-eslint/parser": "^7.13.1",
47
47
  "@vercel/ncc": "^0.38.1",
48
48
  "eslint": "^8.57.0",
49
49
  "eslint-config-prettier": "^9.1.0",
50
50
  "eslint-plugin-import": "^2.29.1",
51
- "eslint-plugin-jest": "^27.9.0",
51
+ "eslint-plugin-jest": "^28.6.0",
52
52
  "eslint-plugin-prettier": "^5.1.3",
53
53
  "jest": "^29.7.0",
54
54
  "jest-circus": "^29.7.0",
55
55
  "nock": "^13.5.4",
56
- "prettier": "^3.2.5",
56
+ "prettier": "^3.3.2",
57
57
  "simple-git-hooks": "^2.11.1",
58
- "ts-jest": "^29.1.2",
59
- "typescript": "^5.4.3"
58
+ "ts-jest": "^29.1.5",
59
+ "typescript": "^5.5.2"
60
60
  },
61
61
  "bugs": {
62
62
  "url": "https://github.com/shivammathur/setup-php/issues"
package/src/configs/mod_priority CHANGED
@@ -6,6 +6,7 @@ couchbase=30
6
6
  decimal=30
7
7
  ds=30
8
8
  event=30
9
+ ev=30
9
10
  grpc=30
10
11
  http=25
11
12
  pecl_http=25
package/src/configs/tools.json CHANGED
@@ -318,5 +318,11 @@
318
318
  "extension": ".phar",
319
319
  "version_parameter": "--version",
320
320
  "version_prefix": "v"
321
+ },
322
+ "easy-coding-standard": {
323
+ "type": "composer",
324
+ "alias": "ecs",
325
+ "repository": "symplify/easy-coding-standard",
326
+ "scope": "scoped"
321
327
  }
322
- }
328
+ }
package/src/extensions.ts CHANGED
@@ -35,9 +35,9 @@ export async function addExtensionDarwin(
35
35
  // match 5.3blackfire...8.3blackfire
36
36
  // match 5.3blackfire-(semver)...8.3blackfire-(semver)
37
37
  // match couchbase, event, geos, pdo_oci, oci8, http, pecl_http
38
- // match 5.3ioncube...7.4ioncube
38
+ // match 5.3ioncube...8.2ioncube
39
39
  // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.3phalcon5
40
- // match 7.0zephir_parser...8.2zephir_parser
40
+ // match 7.0zephir_parser...8.3zephir_parser
41
41
  case /^(7\.4|8\.[0-3])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
42
42
  case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
43
43
  version_extension
@@ -45,12 +45,12 @@ export async function addExtensionDarwin(
45
45
  case /^couchbase|^event|^gearman$|^geos$|^pdo_oci$|^oci8$|^(pecl_)?http|^pdo_firebird$/.test(
46
46
  extension
47
47
  ):
48
- case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
48
+ case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])ioncube$/.test(version_extension):
49
49
  case /(5\.6|7\.[0-3])phalcon3|7\.[2-4]phalcon4|(7\.4|8\.[0-3])phalcon5?/.test(
50
50
  version_extension
51
51
  ):
52
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(
53
+ case /^(7\.[0-4]|8\.[0-3])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
54
54
  version_extension
55
55
  ):
56
56
  add_script += await utils.customPackage(
@@ -137,21 +137,21 @@ export async function addExtensionWindows(
137
137
  // match 5.3blackfire...8.3blackfire
138
138
  // match 5.3blackfire-(semver)...8.3blackfire-(semver)
139
139
  // match pdo_oci and oci8
140
- // match 5.3ioncube...7.4ioncube
140
+ // match 5.3ioncube...8.2ioncube
141
141
  // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, and 7.4phalcon5...8.3phalcon5
142
142
  // match 7.1pecl_http...8.1pecl_http and 7.1http...8.1http
143
- // match 7.0zephir_parser...8.2zephir_parser
143
+ // match 7.0zephir_parser...8.3zephir_parser
144
144
  case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
145
145
  version_extension
146
146
  ):
147
147
  case /^pdo_oci$|^oci8$|^pdo_firebird$/.test(extension):
148
- case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
148
+ case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])ioncube$/.test(version_extension):
149
149
  case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-3])phalcon5?$/.test(
150
150
  version_extension
151
151
  ):
152
152
  case /^(7\.[1-4]|8\.1)(pecl_)?http/.test(version_extension):
153
153
  case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
154
- case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
154
+ case /^(7\.[0-4]|8\.[0-3])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
155
155
  version_extension
156
156
  ):
157
157
  add_script += await utils.customPackage(
@@ -268,9 +268,9 @@ export async function addExtensionLinux(
268
268
  // match 5.3blackfire-(semver)...8.3blackfire-(semver)
269
269
  // match 5.3pdo_cubrid...7.2php_cubrid, 5.3cubrid...7.4cubrid
270
270
  // match couchbase, geos, pdo_oci, oci8, http, pecl_http
271
- // match 5.3ioncube...7.4ioncube
271
+ // match 5.3ioncube...8.2ioncube
272
272
  // match 7.0phalcon3...7.3phalcon3, 7.2phalcon4...7.4phalcon4, 7.4phalcon5...8.3phalcon5
273
- // match 7.0zephir_parser...8.2zephir_parser
273
+ // match 7.0zephir_parser...8.3zephir_parser
274
274
  case /^(7\.4|8\.[0-3])relay(-v?\d+\.\d+\.\d+)?$/.test(version_extension):
275
275
  case /^(5\.[3-6]|7\.[0-4]|8\.[0-3])blackfire(-\d+\.\d+\.\d+)?$/.test(
276
276
  version_extension
@@ -282,12 +282,12 @@ export async function addExtensionLinux(
282
282
  extension
283
283
  ):
284
284
  case /(?<!5\.[3-5])intl-\d+\.\d+$/.test(version_extension):
285
- case /^(5\.[3-6]|7\.[0-4])ioncube$/.test(version_extension):
285
+ case /^(5\.[3-6]|7\.[0-4]|8\.[0-2])ioncube$/.test(version_extension):
286
286
  case /^7\.[0-3]phalcon3$|^7\.[2-4]phalcon4$|^(7\.4|8\.[0-3])phalcon5?$/.test(
287
287
  version_extension
288
288
  ):
289
289
  case /(?<!5\.[3-6])(pdo_)?sqlsrv$/.test(version_extension):
290
- case /^(7\.[0-4]|8\.[0-2])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
290
+ case /^(7\.[0-4]|8\.[0-3])zephir_parser(-v?\d+\.\d+\.\d+)?$/.test(
291
291
  version_extension
292
292
  ):
293
293
  add_script += await utils.customPackage(
package/src/scripts/darwin.sh CHANGED
@@ -164,9 +164,9 @@ add_php() {
164
164
  suffix="$(get_php_formula_suffix)"
165
165
  php_formula="shivammathur/php/php@$version$suffix"
166
166
  if [[ "$existing_version" != "false" && -z "$suffix" ]]; then
167
- ([ "$action" = "upgrade" ] && brew upgrade -f "$php_formula") || brew unlink "$php_formula"
167
+ ([ "$action" = "upgrade" ] && brew upgrade -f --overwrite "$php_formula") || brew unlink "$php_formula"
168
168
  else
169
- brew install -f "$php_formula"
169
+ brew install -f --overwrite "$php_formula"
170
170
  fi
171
171
  sudo chown -R "$(id -un)":"$(id -gn)" "$brew_prefix"
172
172
  brew link --force --overwrite "$php_formula"
package/src/scripts/extensions/blackfire.sh CHANGED
@@ -8,6 +8,10 @@ add_blackfire() {
8
8
  status='Enabled'
9
9
  if ! shared_extension blackfire; then
10
10
  status='Installed and enabled'
11
+ arch="$(uname -m)"
12
+ arch_name="amd64"
13
+ [[ "$arch" = "aarch64" || "$arch" = "arm64" ]] && arch_name="arm64"
14
+ [ "${ts:?}" = 'zts' ] && no_dot_version="${no_dot_version}-zts"
11
15
  if [ "$extension_version" = "blackfire" ]; then
12
16
  if [[ ${version:?} =~ 5.[3-6] ]]; then
13
17
  extension_version='1.50.0'
@@ -15,10 +19,14 @@ add_blackfire() {
15
19
  extension_version=$(get -s -n "" https://blackfire.io/api/v1/releases | grep -Eo 'php":"([0-9]+.[0-9]+.[0-9]+)' | cut -d '"' -f 3)
16
20
  fi
17
21
  fi
18
- get -q -n "${ext_dir:?}/blackfire.so" https://packages.blackfire.io/binaries/blackfire-php/"$extension_version"/blackfire-php-"$platform"_amd64-php-"$no_dot_version".so >/dev/null 2>&1
22
+ get -q -n "${ext_dir:?}/blackfire.so" https://packages.blackfire.io/binaries/blackfire-php/"$extension_version"/blackfire-php-"$platform"_"$arch_name"-php-"$no_dot_version".so >/dev/null 2>&1
23
+ fi
24
+ if [ -e "${ext_dir:?}/blackfire.so" ]; then
25
+ disable_extension xdebug >/dev/null 2>&1
26
+ disable_extension pcov >/dev/null 2>&1
27
+ enable_extension blackfire extension
28
+ add_extension_log blackfire "$status"
29
+ else
30
+ add_extension_log blackfire "Could not install blackfire on PHP ${semver:?}"
19
31
  fi
20
- disable_extension xdebug >/dev/null 2>&1
21
- disable_extension pcov >/dev/null 2>&1
22
- enable_extension blackfire extension
23
- add_extension_log blackfire "$status"
24
32
  }
package/src/scripts/extensions/couchbase.sh CHANGED
@@ -7,15 +7,27 @@ add_couchbase_clibs() {
7
7
  else
8
8
  release=$(get -s -n "" "$trunk"/latest | grep -Eo -m 1 "[0-9]+\.[0-9]+\.[0-9]+" | head -n 1)
9
9
  fi
10
- [ "$VERSION_ID" = "22.04" ] && vid=20.04 || vid="$VERSION_ID"
11
- [ "$VERSION_CODENAME" = "jammy" ] && vcn=focal || vcn="$VERSION_CODENAME"
10
+ [ "$VERSION_ID" = "24.04" ] && vid=22.04 || vid="$VERSION_ID"
11
+ [ "$VERSION_CODENAME" = "noble" ] && vcn=jammy || vcn="$VERSION_CODENAME"
12
12
  deb_url="$trunk/download/$release/libcouchbase-${release}_ubuntu${vid/./}_${vcn}_amd64.tar"
13
13
  get -q -n /tmp/libcouchbase.tar "$deb_url"
14
+ if ! [ -e /tmp/libcouchbase.tar ] || ! file /tmp/libcouchbase.tar | grep -q 'tar archive'; then
15
+ deb_url="$trunk/download/$release/libcouchbase-${release}_ubuntu2004_focal_amd64.tar"
16
+ get -q -n /tmp/libcouchbase.tar "$deb_url"
17
+ add_old_libssl
18
+ fi
14
19
  sudo tar -xf /tmp/libcouchbase.tar -C /tmp
15
20
  install_packages libev4 libevent-dev
16
21
  sudo dpkg -i /tmp/libcouchbase-*/*.deb
17
22
  }
18
23
 
24
+ add_old_libssl() {
25
+ if [[ "$VERSION_ID" = "24.04" ]]; then
26
+ get -q -n /tmp/libssl.deb http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.22_amd64.deb
27
+ [ -e /tmp/libssl.deb ] && sudo dpkg -i /tmp/libssl.deb || add_extension_log "couchbase" "Could not install libssl1.1"
28
+ fi
29
+ }
30
+
19
31
  add_couchbase_cxxlibs() {
20
32
  if [ "${runner:?}" = "self-hosted" ]; then
21
33
  add_list cmake https://apt.kitware.com/ubuntu/ https://apt.kitware.com/keys/kitware-archive-latest.asc "$VERSION_CODENAME" main
@@ -33,7 +45,7 @@ get_couchbase_version() {
33
45
  elif [ "${version:?}" = '7.3' ]; then
34
46
  echo couchbase-3.2.2
35
47
  elif [ "${version:?}" = '7.4' ]; then
36
- echo couchbase-4.1.0
48
+ echo couchbase-4.1.1
37
49
  else
38
50
  echo couchbase
39
51
  fi
package/src/scripts/extensions/firebird.sh CHANGED
@@ -1,11 +1,14 @@
1
1
  add_firebird_client_darwin() {
2
- firebird_tag='R3_0_7'
3
- pkg_name=$(get -s -n "" https://api.github.com/repos/FirebirdSQL/firebird/releases/tags/"$firebird_tag" | grep -Eo "Firebird-.*.pkg" | head -n 1)
4
- [ -z "$pkg_name" ] && pkg_name=$(get -s -n "" https://github.com/FirebirdSQL/firebird/releases/expanded_assets/"$firebird_tag" | grep -Eo "Firebird-.*.pkg" | head -n 1)
2
+ firebird_tag='v5.0.0'
3
+ arch_name='x64'
4
+ arch="$(uname -m)"
5
+ [[ "$arch" = "arm64" || "$arch" = "aarch64" ]] && arch_name='arm64'
6
+ pkg_name=$(get -s -n "" https://api.github.com/repos/FirebirdSQL/firebird/releases/tags/"$firebird_tag" | grep -Eo "Firebird-.*.-$arch_name.pkg" | head -n 1)
7
+ [ -z "$pkg_name" ] && pkg_name=$(get -s -n "" https://github.com/FirebirdSQL/firebird/releases/expanded_assets/"$firebird_tag" | grep -Eo "Firebird-.*.-$arch_name.pkg" | head -n 1)
5
8
  get -q -e "/tmp/firebird.pkg" https://github.com/FirebirdSQL/firebird/releases/download/"$firebird_tag"/"$pkg_name"
6
9
  sudo installer -pkg /tmp/firebird.pkg -target /
7
10
  sudo mkdir -p /opt/firebird/include /opt/firebird/lib
8
- sudo find /Library/Frameworks/Firebird.framework -name '*.h' -exec cp "{}" /opt/firebird/include \;
11
+ sudo cp -a /Library/Frameworks/Firebird.framework/Headers/* /opt/firebird/include/
9
12
  sudo find /Library/Frameworks/Firebird.framework -name '*.dylib' -exec cp "{}" /opt/firebird/lib \;
10
13
  }
11
14
 
package/src/scripts/extensions/ioncube.sh CHANGED
@@ -10,12 +10,23 @@ add_ioncube() {
10
10
  status='Enabled'
11
11
  if ! shared_extension ioncube; then
12
12
  status='Installed and enabled'
13
- os_name='lin' && [ "$(uname -s)" = "Darwin" ] && os_name='mac'
14
- get -s -n "" https://downloads.ioncube.com/loader_downloads/ioncube_loaders_"$os_name"_x86-64.tar.gz | tar -xzf - -C /tmp
15
- sudo mv /tmp/ioncube/ioncube_loader_"$os_name"_"${version:?}".so "${ext_dir:?}/ioncube.so"
16
- sudo cp /tmp/ioncube/LICENSE.txt "$ext_dir"/IONCUBE_LICENSE.txt
13
+ arch="$(uname -m)"
14
+ if [ "$(uname -s)" = "Darwin" ]; then
15
+ [ "$arch" = "arm64" ] && os_suffix="dar_arm64" || os_suffix="mac_x86-64"
16
+ else
17
+ [[ "$arch" = "i386" || "$arch" = "i686" ]] && arch=x86
18
+ [[ "$arch" = "x86_64" ]] && arch=x86-64
19
+ os_suffix="lin_$arch"
20
+ fi
21
+ ts_part="" && [ "${ts:?}" = "zts" ] && ts_part="_ts"
22
+ get -s -n "" https://downloads.ioncube.com/loader_downloads/ioncube_loaders_"$os_suffix".tar.gz | tar -xzf - -C /tmp
23
+ loader_file=/tmp/ioncube/ioncube_loader_"${os_suffix%%_*}_${version:?}$ts_part".so
24
+ if [ -e "$loader_file" ]; then
25
+ sudo mv /tmp/ioncube/ioncube_loader_"${os_suffix%%_*}_${version:?}$ts_part".so "${ext_dir:?}/ioncube.so"
26
+ sudo cp /tmp/ioncube/LICENSE.txt "$ext_dir"/IONCUBE_LICENSE.txt
27
+ echo "zend_extension=$ext_dir/ioncube.so" | sudo tee "${scan_dir:?}/00-ioncube.ini" >/dev/null 2>&1
28
+ fi
17
29
  fi
18
- echo "zend_extension=$ext_dir/ioncube.so" | sudo tee "${scan_dir:?}/00-ioncube.ini" >/dev/null 2>&1
19
30
  add_extension_log "ioncube" "$status"
20
31
  check_extension "ioncube" && add_license_log
21
32
  }
package/src/scripts/extensions/oci.sh CHANGED
@@ -30,6 +30,10 @@ add_client() {
30
30
  sudo mv "$icdir"/* "$oracle_client"/
31
31
  done
32
32
  sudo ln -sf /opt/oracle/instantclient/*.$lib_ext* $libs
33
+ if [ "$os" = "Linux" ]; then
34
+ arch="$(uname -m)"
35
+ [ -e "$libs/$arch"-linux-gnu/libaio.so.1t64 ] && sudo ln -sf "$libs/$arch"-linux-gnu/libaio.so.1t64 "$libs/$arch"-linux-gnu/libaio.so.1
36
+ fi
33
37
  fi
34
38
  }
35
39
 
package/src/scripts/extensions/phalcon.sh CHANGED
@@ -1,7 +1,11 @@
1
1
  # Helper function to get phalcon version
2
2
  get_phalcon_version() {
3
3
  if [ "$extension" = "phalcon5" ]; then
4
- get_pecl_version phalcon stable 5
4
+ if [ "${version:?}" = "7.4" ]; then
5
+ echo '5.4.0'
6
+ else
7
+ get_pecl_version phalcon stable 5
8
+ fi
5
9
  elif [ "$extension" = "phalcon4" ]; then
6
10
  echo '4.1.2'
7
11
  elif [ "$extension" = "phalcon3" ]; then
package/src/scripts/extensions/relay.sh CHANGED
@@ -2,7 +2,11 @@
2
2
  get_relay_version() {
3
3
  local ext=$1
4
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
5
+ if [ "${version:?}" = "7.4" ]; then
6
+ echo 'v0.7.0'
7
+ else
8
+ 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
9
+ fi
6
10
  else
7
11
  relay_version="${ext##*-}"
8
12
  echo "v${relay_version/v//}"
@@ -40,6 +44,7 @@ change_library_paths() {
40
44
  install_name_tool -change "$(echo "${dylibs}" | grep -E "liblz4.*dylib" | xargs)" "$brew_prefix"/opt/lz4/lib/liblz4.dylib "$ext_dir"/relay.so
41
45
  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
46
  install_name_tool -change "$(echo "${dylibs}" | grep -E "libcrypto.*dylib" | xargs)" "$brew_prefix"/opt/openssl@"$openssl_version"/lib/libcrypto.dylib "$ext_dir"/relay.so
47
+ install_name_tool -change "$(echo "${dylibs}" | grep -E "libck.*dylib" | xargs)" "$brew_prefix"/opt/concurrencykit/lib/libck.dylib "$ext_dir"/relay.so
43
48
  fi
44
49
  }
45
50
 
@@ -51,7 +56,7 @@ add_relay_dependencies() {
51
56
  if [ "$os" = "Darwin" ]; then
52
57
  . "${0%/*}"/tools/brew.sh
53
58
  configure_brew
54
- brew install hiredis lz4 zstd
59
+ brew install hiredis lz4 zstd concurrencykit
55
60
  fi
56
61
  }
57
62
 
@@ -92,8 +97,7 @@ enable_relay() {
92
97
  # Patch binary id in relay extension
93
98
  init_relay_binary_id() {
94
99
  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
100
+ sudo LC_ALL=C sed -i.bak "s/00000000-0000-0000-0000-000000000000/$(uuidgen)/" "$ext_dir"/relay.so || true
97
101
  fi
98
102
  }
99
103
 
package/src/scripts/linux.sh CHANGED
@@ -6,6 +6,14 @@ add_sudo() {
6
6
  fi
7
7
  }
8
8
 
9
+ # Function to link apt-fast to apt-get
10
+ link_apt_fast() {
11
+ if ! command -v apt-fast >/dev/null; then
12
+ sudo ln -sf /usr/bin/apt-get /usr/bin/apt-fast
13
+ trap "sudo rm -f /usr/bin/apt-fast 2>/dev/null" exit
14
+ fi
15
+ }
16
+
9
17
  # Function to setup environment for self-hosted runners.
10
18
  self_hosted_helper() {
11
19
  if ! command -v apt-fast >/dev/null; then
@@ -23,6 +31,10 @@ fix_broken_packages() {
23
31
  # Function to install a package
24
32
  install_packages() {
25
33
  packages=("$@")
34
+ if ! [ -e /etc/dpkg/dpkg.cfg.d/force-confnew ]; then
35
+ echo "force-confnew" | sudo tee /etc/dpkg/dpkg.cfg.d/force-confnew >/dev/null 2>&1
36
+ trap "sudo rm -f /etc/dpkg/dpkg.cfg.d/force-confnew 2>/dev/null" exit
37
+ fi
26
38
  $apt_install "${packages[@]}" >/dev/null 2>&1 || (update_lists && fix_broken_packages && $apt_install "${packages[@]}" >/dev/null 2>&1)
27
39
  }
28
40
 
@@ -285,6 +297,7 @@ apt_install="sudo $debconf_fix apt-fast install -y --no-install-recommends"
285
297
  scripts="$src"/scripts
286
298
 
287
299
  add_sudo >/dev/null 2>&1
300
+ link_apt_fast >/dev/null 2>&1
288
301
 
289
302
  . /etc/os-release
290
303
  # shellcheck source=.