Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 23 additions & 29 deletions .github/workflows/backend-ci.yaml
Original file line number Diff line number Diff line change
@@ -1,49 +1,48 @@
name: Backend build
name: Backend CI

on:
push:
branches:
- main
- '[0-9]+.[0-9]+'
pull_request: ~
workflow_dispatch: ~

jobs:
cs-fix:
name: Run code style check
runs-on: "ubuntu-24.04"
runs-on: "ubuntu-26.04"
strategy:
matrix:
php:
- '8.3'
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Setup PHP Action
uses: shivammathur/setup-php@v2
- uses: ibexa/gh-workflows/actions/composer-install@main
with:
php-version: ${{ matrix.php }}
coverage: none
extensions: 'pdo_sqlite, gd'
tools: cs2pr

- uses: ramsey/composer-install@v3
with:
dependency-versions: "highest"
gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }}

- name: Run code style check
run: composer run-script check-cs -- --format=checkstyle | cs2pr
shell: bash
run: |
set -euo pipefail
composer run-script check-cs -- --format=checkstyle | cs2pr

deptrac:
name: Deptrac
runs-on: ubuntu-latest
runs-on: ubuntu-26.04
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: Deptrac
uses: smoench/deptrac-action@master
uses: smoench/deptrac-action@1.0.2

tests:
name: Tests
runs-on: "ubuntu-24.04"
runs-on: "ubuntu-26.04"
timeout-minutes: 10

strategy:
Expand All @@ -54,20 +53,15 @@ jobs:
- '8.4'

steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7

- name: Setup PHP Action
uses: shivammathur/setup-php@v2
- uses: ibexa/gh-workflows/actions/composer-install@main
with:
php-version: ${{ matrix.php }}
coverage: none
extensions: pdo_sqlite, gd
tools: cs2pr

- uses: ramsey/composer-install@v3
with:
dependency-versions: "highest"
composer-options: "--prefer-dist --no-progress --no-suggest"
gh-client-id: ${{ secrets.AUTOMATION_CLIENT_ID }}
gh-client-secret: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
satis-network-key: ${{ secrets.SATIS_NETWORK_KEY }}
satis-network-token: ${{ secrets.SATIS_NETWORK_TOKEN }}

- name: Setup problem matchers for PHPUnit
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/pr-check.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: PR check
on:
pull_request:
types:
- opened
- synchronize
- reopened
- edited

jobs:
test-base-branch:
uses: ibexa/gh-workflows/.github/workflows/pr-check.yml@main
15 changes: 15 additions & 0 deletions .github/workflows/reviewers.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: On PR Review Requested

on:
pull_request:
types: [review_requested]

jobs:
call-expand-team-reviewers:
if: ${{ github.event.requested_team }}
uses: ibexa/gh-workflows/.github/workflows/expand-team-reviewers.yml@main
with:
requested_team: ${{ github.event.requested_team.slug }}
pull_request_number: ${{ github.event.pull_request.number }}
repository: ${{ github.repository }}
secrets: inherit
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"qossmic/deptrac-shim": "^0.24.0 || ^1.0.2"
},
"conflict": {
"rector/rector": "2.2.6"
"rector/rector": "2.2.6 || >=2.6.2"

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we align this with 5.0 instead of an open-ended conflict? rector#51
bounded require directly:

    "rector/rector": "^2.0, <2.6.2"

and left conflict as just "2.2.6". Doing the same here keeps the mechanism consistent across the gitflow line (otherwise the 4.6 ->5.0 merge-up ends up with both require: <2.6.2 and conflict: >=2.6.2), and an upper bound in require doesn't propagate a permanent conflict into every consumer of ibexa/rector.

The description says 2.6.4+ is the first broken release while the constraint cuts at 2.6.2. Worth a line on whether 2.6.2 and 2.6.3 are also known-bad or just excluded to be safe.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we align this with 5.0 instead of an open-ended conflict? rector#51 bounded require directly:

    "rector/rector": "^2.0, <2.6.2"

and left conflict as just "2.2.6". Doing the same here keeps the mechanism consistent across the gitflow line (otherwise the 4.6 ->5.0 merge-up ends up with both require: <2.6.2 and conflict: >=2.6.2), and an upper bound in require doesn't propagate a permanent conflict into every consumer of ibexa/rector.

The description says 2.6.4+ is the first broken release while the constraint cuts at 2.6.2. Worth a line on whether 2.6.2 and 2.6.3 are also known-bad or just excluded to be safe.

Strong -1

The issue resolution/workaround there was incorrect. conflict is EXACTLY the feature designed to handle this situation.

},
"autoload": {
"psr-4": {
Expand Down