Skip to content

IBX-11778: Merged branch '4.6' into 5.0 - #25

Merged
alongosz merged 3 commits into
5.0from
merge/4.6-to-5.0
Sep 14, 2026
Merged

alongosz merged 3 commits into
5.0from
merge/4.6-to-5.0

Conversation

@alongosz

Copy link
Copy Markdown
Member

Caution

This is a merge pull request

🎫 Issue IBX-11778

Related PRs:

Description:

Merge-up of #22. One conflict, in backend-ci.yaml.

  • [GHA] Deptrac: kept 5.0's composer run-script deptrac form and
    applied the standardization to it. 4.6 is still on the bundled
    smoench/deptrac-action, 5.0+ has deptrac/deptrac + deptrac.yaml
    (IBX-12229), so 4.6's shape must not win here.
  • [GHA] Deptrac php-version is now '8.3'. The job has no matrix, so
    ${{ matrix.php }} resolved to an empty string and setup-php installed
    latest stable —
    PHP 8.5.10 on the last 6.0 run,
    on a branch where everything else tests 8.3/8.4.
  • [GHA] cs-fix and tests took 4.6's standardization, keeping 5.0's
    PHP matrices.
  • [GHA] Replaced the inline rector job with the shared reusable
    workflow, same as ibexa/connector-anthropic 5.0. Separate commit.

pr-assign.yaml is a propagated 4.6 deletion — 5.0 hasn't touched it since
the merge base (b1e4a5b).

For QA:

No QA required. Deptrac should now report 8.3 instead of 8.5.x.

Documentation:

No documentation required.

🤖 Generated with Claude Code

alongosz and others added 3 commits September 13, 2026 17:23
For more details see https://ibexa.atlassian.net/browse/IBX-11778 and #22

Key changes:

* Renamed the CI workflow to "Backend CI" and added a bare workflow_dispatch trigger (IBX-12062)

* Bumped actions/checkout and actions/setup-node to v7

* Pinned smoench/deptrac-action to the 1.0.2 tag instead of the master branch

* Standardized all runner labels to ubuntu-26.04

* Replaced direct ramsey/composer-install steps with the shared ibexa/gh-workflows composer-install action, passing the PHP version explicitly (IBX-11907)

* Dropped the setup-php steps made redundant by the composer-install action

* Dropped the non-existent main branch from the push triggers of backend-ci, browser-tests and frontend-ci

* Guarded the code style check with set -euo pipefail so cs2pr no longer masks check-cs failures (IBX-11853)

* Replaced the legacy zendesk-based release workflow (with its actions/checkout@master pin) with the skeleton release.yaml calling the shared release_bundle.yml reusable workflow

* Removed the deprecated pr-assign.yaml workflow

---------

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Conflict in .github/workflows/backend-ci.yaml. Kept 5.0's IBX-12229
Deptrac form (deptrac/deptrac + deptrac.yaml + composer run-script
deptrac) over 4.6's smoench/deptrac-action, and applied the IBX-11778
standardization to it. The job has no matrix, so its dangling
php-version: ${{ matrix.php }} resolved to an empty string and setup-php
installed latest stable - PHP 8.5.10 on the last 6.0 run of the identical
job. Written out as '8.3', the composer floor.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
The inline job in backend-ci.yaml was the only one left on the old form
after the merge-up: ubuntu-24.04, checkout@v5, hand-rolled setup-php plus
ramsey/composer-install. Replaced by the shared reusable workflow, same
form as ibexa/connector-anthropic 5.0.

rector.php and the ibexa/rector dev requirement are both present on this
branch, so the gating holds.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
@alongosz alongosz added the Fast-forward merge PR should be merged in a fast-forward way label Sep 14, 2026
@alongosz
alongosz marked this pull request as ready for review September 14, 2026 20:43
@alongosz
alongosz merged commit ec60193 into 5.0 Sep 14, 2026
9 checks passed
@alongosz
alongosz deleted the merge/4.6-to-5.0 branch September 14, 2026 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Fast-forward merge PR should be merged in a fast-forward way

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant