IBX-11778: Merged branch '4.6' into 5.0 - #120
Draft
alongosz wants to merge 5 commits into
Draft
Conversation
For more details see https://ibexa.atlassian.net/browse/IBX-11778 and #119 Key changes: * Renamed the CI workflow to `Backend CI` and added a `workflow_dispatch` trigger for manual runs * Standardized runners to `ubuntu-26.04` and updated `actions/checkout` to v7 across workflows * Passed the PHP version explicitly to the shared `composer-install` action instead of relying on matrix fallback * Fixed `check-cs` step in `backend-ci.yaml` so pipeline failures are no longer masked, using `set -euo pipefail` * Fixed Solr integration tests on `ubuntu-26.04` by pinning per-version JDKs via `actions/setup-java` (Java 11 for Solr 7.7.3, Java 17 for 8.11.2/9.8.1) instead of the default Java 25, and removed the redundant standalone `setup-php` step * Removed the deprecated `pr-assign.yaml` workflow and dropped non-existent `main`/`master` branches from push triggers --------- Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
# Conflicts: # .github/workflows/integration-tests.yaml
Ibexa DXP 5.0 supports Solr 8.11.1+ and 9.8.1+ only. Solr 7.7 is 4.6, so the 7.7.3 matrix leg here has been testing an unsupported version. #119 added a per-Solr-version JDK mapping on 4.6, because Solr 7.7 needs Java 11 - its bin/solr passes the CMS garbage collector flags that JDK 14 removed. It came across in the merge without a conflict. With 7.7.3 gone the mapping has a single value left, so it collapses back to a flat Temurin 17, which is what the runner needs anyway: ubuntu-26.04 ships Java 25 and Solr 9.8.1 will not start under it. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Replaced the inline rector job in backend-ci.yaml with a dedicated rector.yaml calling ibexa/gh-workflows' reusable Rector workflow, matching the org standard and ibexa/core. The 4.6 GHA standardization could not cover this: Rector exists only on 5.0+ branches, so a merge-up leaves the old form in place and git reports no conflict for it. This also retires the repository's last Node.js 20 action: the inline job used ramsey/composer-install@v3, whose pinned actions/cache 4.2.4 runs on Node 20, which is removed from the runners on 2026-09-16. Its shivammathur/setup-php step goes away with it, since the reusable workflow installs PHP itself. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Caution
This is a merge pull request
Related PRs:
Description:
Not pushed straight to 5.0 like the rest of this merge-up batch, because #119's
Solr/Java change needed a closer look.
#119 added a per-Solr-version JDK mapping on 4.6 — Solr 7.7 needs Java 11, its
bin/solrpasses the CMS GC flags that JDK 14 removed. It merged in herewithout a conflict, which is exactly why it nearly went unnoticed. It shouldn't
come across: 5.0 supports Solr 8.11.1+ and 9.8.1+ only, 7.7 is 4.6. So the
7.7.3leg in our matrix has been testing a version 5.0 doesn't support.Merged branch '4.6' into 5.0—integration-tests.yamlwas the onlyconflict. Kept 5.0's
php-versionmatrix (8.3) against IBX-11778: Updated GitHub Actions workflows to org standard #119's hardcoded7.4, took the rest of the standardization (Ibexacomposer-install,checkout@v7,ubuntu-26.04, stalemaintrigger dropped)[GHA]Dropped the7.7.3leg and flattened the JDK pin to Temurin 17 —with 7.7 gone the mapping has a single value left. Java 17 is still needed:
ubuntu-26.04 ships Java 25 and Solr 9.8.1 won't start under it
[GHA][Rector PHP]Reused the shared Rector workflow — inline rector jobin
backend-ci.yamlreplaced by arector.yamlcallingibexa/gh-workflows, same as the rest of the batchKept the Solr 7.7 drop out of the merge commit on purpose, so the 5.0-only
decision stays visible and revertable on its own.
For QA:
No QA required. CI here is the check.
Documentation:
No documentation required.
🤖 Generated with Claude Code