From 23d52a26c9512d8d60a3190b6c6195b66a2fed82 Mon Sep 17 00:00:00 2001 From: berfinyuksel <99557970+berfinyuksel@users.noreply.github.com> Date: Fri, 14 Aug 2026 14:40:08 +0200 Subject: [PATCH] Sync non-matrix workflows on 1.4 with 2026.x (product-management#1305) Adopted files are byte-identical to origin/2026.x. Matrix workflows untouched. Changes: adopt:cla.yml adopt:php-cs-fixer.yaml Co-Authored-By: Claude Opus 5 --- .github/workflows/cla.yml | 42 ++++++++--------------------- .github/workflows/php-cs-fixer.yaml | 27 +++++++------------ 2 files changed, 21 insertions(+), 48 deletions(-) diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml index 9355f98..ec376e9 100644 --- a/.github/workflows/cla.yml +++ b/.github/workflows/cla.yml @@ -1,34 +1,14 @@ -name: "CLA Assistant" +name: CLA check + on: - issue_comment: - types: [ created ] - pull_request_target: - types: [ opened,closed,synchronize ] + issue_comment: + types: [created] + pull_request_target: + types: [opened, closed, synchronize] jobs: - CLAssistant: - runs-on: ubuntu-latest - steps: - - name: "CLA Assistant" - if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' - # Beta Release - uses: cla-assistant/github-action@v2.1.1-beta - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # the below token should have repo scope and must be manually added by you in the repository's secret - PERSONAL_ACCESS_TOKEN: ${{ secrets.CLA_ACTION_ACCESS_TOKEN }} - with: - path-to-signatures: 'signatures/version1/cla.json' - path-to-document: 'https://github.com/pimcore/pimcore/blob/master/CLA.md' # e.g. a CLA or a DCO document - # branch should not be protected - branch: 'main' - allowlist: user1,bot* - - #below are the optional inputs - If the optional inputs are not given, then default values will be taken - remote-organization-name: 'pimcore' #enter the remote organization name where the signatures should be stored (Default is storing the signatures in the same repository) - remote-repository-name: 'cla' - #create-file-commit-message: 'For example: Creating file for storing CLA Signatures' - #signed-commit-message: 'For example: $contributorName has signed the CLA in #$pullRequestNo' - #custom-notsigned-prcomment: 'pull request comment with Introductory message to ask new contributors to sign' - #custom-pr-sign-comment: 'The signature to be committed in order to sign the CLA' - #custom-allsigned-prcomment: 'pull request comment when all contributors has signed, defaults to **CLA Assistant Lite bot** All Contributors have signed the CLA.' + cla-workflow: + uses: pimcore/workflows-collection-public/.github/workflows/reusable-cla-check.yaml@main + if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' + secrets: + CLA_ACTION_ACCESS_TOKEN: ${{ secrets.CLA_ACTION_ACCESS_TOKEN }} diff --git a/.github/workflows/php-cs-fixer.yaml b/.github/workflows/php-cs-fixer.yaml index 2e4bc56..f2d696e 100644 --- a/.github/workflows/php-cs-fixer.yaml +++ b/.github/workflows/php-cs-fixer.yaml @@ -5,23 +5,16 @@ on: branches: - "[0-9]+.[0-9]+" - "[0-9]+.x" - permissions: - contents: read + contents: write jobs: - php-cs-fixer: - permissions: - contents: write # for stefanzweifel/git-auto-commit-action to push code in repo - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - ref: ${{ github.head_ref }} - - - name: PHP-CS-Fixer - uses: docker://oskarstark/php-cs-fixer-ga:latest - - - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: Apply php-cs-fixer changes \ No newline at end of file + php-style: + uses: pimcore/workflows-collection-public/.github/workflows/reusable-php-cs-fixer.yaml@main + if: github.repository_owner == 'pimcore' + secrets: + PHP_CS_FIXER_GITHUB_TOKEN: ${{ secrets.PHP_CS_FIXER_GITHUB_TOKEN }} + with: + head_ref: ${{ github.head_ref || github.ref_name }} + repository: ${{ github.repository }} + config_file: .php-cs-fixer.dist.php