Skip to content

Commit 0c9e8fc

Browse files
chore(deps): update php min version in composer.json, add roave/secur… (#41482)
* chore(deps): update php min version in composer.json, add roave/security-advisories and update all deps * test: adjust acceptance test script to correctly process failed scenarios Recent enhancements to the Behat Gherkin processing have added text to the output of the lines that summarize the failed cc scenarios in a test run. The output now looks like: " /path/to/feature/file/someScenarios.feature:55 (on line 66)" The text " (on line 66)" has been added. We need to strip that off when finding the actual feature file and scenario line number. * chore(ci): wait for Apache server(s) early See issue 41490. The "server" and "federated" drone services startup asynch. They create `openssl` certificates that are needed by the installServer drone step. If the docker images for these services are slow to pull, then the certificate(s) might not be available on-disk for the installServer step to use. This commit moves the waitForServer step earlier, before the installServer step. --------- Co-authored-by: Phillip Davis <phil@jankaritech.com>
1 parent 73728eb commit 0c9e8fc

4 files changed

Lines changed: 1109 additions & 41 deletions

File tree

.drone.star

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1524,6 +1524,7 @@ def acceptance(ctx):
15241524
composerInstall(phpVersion) +
15251525
vendorbinBehat() +
15261526
yarnInstall() +
1527+
waitForServer(params["federatedServerNeeded"]) +
15271528
((
15281529
installCoreFromTarball(params["coreTarball"], db, params["logLevel"], params["useHttps"], params["federatedServerNeeded"], params["proxyNeeded"], pathOfServerUnderTest)
15291530
) if params["testAgainstCoreTarball"] else (
@@ -1537,7 +1538,6 @@ def acceptance(ctx):
15371538
setupCeph(phpVersion, params["cephS3"]) +
15381539
setupScality(phpVersion, params["scalityS3"]) +
15391540
params["extraSetup"] +
1540-
waitForServer(params["federatedServerNeeded"]) +
15411541
waitForEmailService(params["emailNeeded"]) +
15421542
waitForBrowserService(browser) +
15431543
fixPermissions(phpVersion, params["federatedServerNeeded"], params["selUserNeeded"], pathOfServerUnderTest) +

composer.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"optimize-autoloader": true,
88
"classmap-authoritative": false,
99
"platform": {
10-
"php": "8.2"
10+
"php": "8.3"
1111
},
1212
"allow-plugins": {
1313
"bamarni/composer-bin-plugin": true,
@@ -41,10 +41,11 @@
4141
"require-dev": {
4242
"bamarni/composer-bin-plugin": "^1.8",
4343
"mikey179/vfsstream": "^1.6",
44-
"phpunit/phpunit": "^9.5"
44+
"phpunit/phpunit": "^9.5",
45+
"roave/security-advisories": "dev-latest"
4546
},
4647
"require": {
47-
"php": ">=8.2",
48+
"php": ">=8.3",
4849
"ext-apcu": "*",
4950
"ext-ctype": "*",
5051
"ext-curl": "*",

0 commit comments

Comments
 (0)