Skip to content

IBX-11778,IBX-12358: Merged branch '5.0' into 6.0 - #2086

Merged
alongosz merged 7 commits into
6.0from
merge/5.0-to-6.0
Sep 13, 2026
Merged

alongosz merged 7 commits into
6.0from
merge/5.0-to-6.0

Conversation

@Steveb-p

@Steveb-p Steveb-p commented Sep 12, 2026

Copy link
Copy Markdown
Contributor

Steveb-p and others added 5 commits September 10, 2026 14:18
# Conflicts:
#	composer.json
For more details see https://ibexa.atlassian.net/browse/IBX-11778 and #2063

Key changes:

* Renamed the CI workflow to `Backend CI` and kept its `workflow_dispatch` inputs and notify-slack job

* Updated third-party GitHub Actions (`actions/checkout`, `actions/setup-node`, `slackapi/slack-github-action` to v4.0.0) and standardized runners to `ubuntu-26.04`

* Passed the PHP version explicitly to the shared `composer-install` action

* Dropped non-existent `main`/`master` branches from push triggers in `backend-ci`, `frontend-ci` and `browser-tests` workflows

* Removed the deprecated `pr-assign.yaml` workflow

* Guarded the code style check step with `set -euo pipefail` so `check-cs` failures are no longer masked by `cs2pr`

---------

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5 (1M context) <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 inline job was also broken: it ran setup-php with the matrix PHP
version, then did a second checkout that reset the workspace, and never
passed php-version to composer-install.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@Steveb-p Steveb-p added the Fast-forward merge PR should be merged in a fast-forward way label Sep 12, 2026
# Conflicts:
#	.github/workflows/backend-ci.yaml
#	.github/workflows/frontend-ci.yaml
The Deptrac and Frontend build jobs are 6.0-only, so the 4.6 workflow
sweep never reached them and both called composer-install without a
php-version. Deptrac has a `php` matrix, so its fallback already
resolved to 8.4 and this only makes it explicit. The Frontend build job
has no matrix at all, so setup-php was installing its default latest
stable PHP - pinned to 8.4 to match the rest of the branch.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
@alongosz
alongosz marked this pull request as ready for review September 13, 2026 14:21
@sonarqubecloud

Copy link
Copy Markdown

@alongosz
alongosz merged commit f39c5bc into 6.0 Sep 13, 2026
24 checks passed
@alongosz
alongosz deleted the merge/5.0-to-6.0 branch September 13, 2026 15:05
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.

6 participants