From 83b2adcc226a96f0cf1c4bfb2272c5bd5e35cd37 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Sat, 5 Sep 2026 21:02:22 +0200 Subject: [PATCH 1/3] [GHA] Updated GitHub Actions workflows to latest versions and standards - Renamed the CI workflow to Backend CI and added a bare workflow_dispatch trigger - Updated actions/checkout to v7 - Pinned smoench/deptrac-action to the 1.0.2 tag instead of the master branch - Standardized runners to ubuntu-26.04 - Dropped non-existent main branch from push triggers - Replaced direct ramsey/composer-install and setup-php steps with the ibexa/gh-workflows composer-install action, passing the PHP version explicitly; dropped the redundant composer-options flags - Guarded the code style check against masked pipe failures with set -euo pipefail (IBX-11853) --- .github/workflows/backend-ci.yaml | 52 ++++++++++++++----------------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/.github/workflows/backend-ci.yaml b/.github/workflows/backend-ci.yaml index 2ec896a..9657994 100644 --- a/.github/workflows/backend-ci.yaml +++ b/.github/workflows/backend-ci.yaml @@ -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: @@ -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" From 83b247b393b543132f7527ccc5db16a592249cd4 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Sat, 5 Sep 2026 21:02:22 +0200 Subject: [PATCH 2/3] [GHA] Added missing workflows from bundle-generator skeleton - .github/workflows/pr-check.yaml - .github/workflows/reviewers.yaml --- .github/workflows/pr-check.yaml | 12 ++++++++++++ .github/workflows/reviewers.yaml | 15 +++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 .github/workflows/pr-check.yaml create mode 100644 .github/workflows/reviewers.yaml diff --git a/.github/workflows/pr-check.yaml b/.github/workflows/pr-check.yaml new file mode 100644 index 0000000..d3413dc --- /dev/null +++ b/.github/workflows/pr-check.yaml @@ -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 diff --git a/.github/workflows/reviewers.yaml b/.github/workflows/reviewers.yaml new file mode 100644 index 0000000..0c55d2d --- /dev/null +++ b/.github/workflows/reviewers.yaml @@ -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 From 11f1b17cedf5142180132b8ac8bfe477a82fc264 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Sat, 5 Sep 2026 22:46:09 +0200 Subject: [PATCH 3/3] [Composer] Added conflict with rector/rector >=2.6.2 Interim measure from IBX-12365, mirroring the "<2.6.2" narrowing done on 5.0 (rector#51) which never reached this branch. rector/rector 2.6.4 and later also change fluent method-call handling so that the RemoveInterfaceWithMethodsRector fixtures fail; 2.6.1 resolves and the suite passes. --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 283492a..c73ada6 100644 --- a/composer.json +++ b/composer.json @@ -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" }, "autoload": { "psr-4": {