From 12fe1f84515986383c25a4a1959c53cc71e5f554 Mon Sep 17 00:00:00 2001 From: berfinyuksel <99557970+berfinyuksel@users.noreply.github.com> Date: Tue, 15 Sep 2026 17:39:56 +0200 Subject: [PATCH 1/2] Replace PR Policy with thin caller for reusable workflow --- .github/workflows/pr-policy.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/pr-policy.yml diff --git a/.github/workflows/pr-policy.yml b/.github/workflows/pr-policy.yml new file mode 100644 index 0000000..547df63 --- /dev/null +++ b/.github/workflows/pr-policy.yml @@ -0,0 +1,30 @@ +name: PR Policy + +# Thin caller — the policy logic lives in +# pimcore/workflows-collection-public/.github/workflows/reusable-pr-policy.yml +# and changes there apply automatically. Make the "PR Policy / Milestone assigned" +# check required (repo ruleset / branch protection) so it actually blocks merging. + +on: + pull_request: + types: + - opened + - reopened + - synchronize + - ready_for_review + - milestoned + - demilestoned + - labeled + - unlabeled + +permissions: + contents: read + +concurrency: + group: pr-policy-${{ github.event.pull_request.number }} + cancel-in-progress: true + +jobs: + pr-policy: + name: PR Policy + uses: pimcore/workflows-collection-public/.github/workflows/reusable-pr-policy.yml@main From 1ff8e7bbb279a8c906b2f3142029de0a15439b67 Mon Sep 17 00:00:00 2001 From: berfinyuksel <99557970+berfinyuksel@users.noreply.github.com> Date: Wed, 16 Sep 2026 16:33:30 +0200 Subject: [PATCH 2/2] Clean up 2025.4 workflows: OSV matrix, docs workflow, composer check --- .../composer-outdated-check-latest.yaml | 2 +- .github/workflows/docs.yaml.bak | 77 ------------------- .github/workflows/{new-docs.yml => docs.yml} | 10 +-- .github/workflows/osv-checks.yaml | 4 +- 4 files changed, 6 insertions(+), 87 deletions(-) delete mode 100644 .github/workflows/docs.yaml.bak rename .github/workflows/{new-docs.yml => docs.yml} (65%) diff --git a/.github/workflows/composer-outdated-check-latest.yaml b/.github/workflows/composer-outdated-check-latest.yaml index 289aeb0..03b66e3 100644 --- a/.github/workflows/composer-outdated-check-latest.yaml +++ b/.github/workflows/composer-outdated-check-latest.yaml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: include: - - { php-version: 8.4, branch: prepare-2025.x } + - { php-version: 8.4, branch: 2025.4 } with: php-version: ${{ matrix.php-version }} branch: ${{ matrix.branch }} diff --git a/.github/workflows/docs.yaml.bak b/.github/workflows/docs.yaml.bak deleted file mode 100644 index 7854c4f..0000000 --- a/.github/workflows/docs.yaml.bak +++ /dev/null @@ -1,77 +0,0 @@ -# Original docs workflow disabled in favor of new-docs.yml -# This file is kept only for reference. The active workflow is .github/workflows/new-docs.yml -# Backup of the original content: .github/workflows/docs.yaml.bak - -# -# name: "Documentation" -# -# on: -# pull_request_target: -# branches: -# - "[0-9]+.[0-9]+" -# - "[0-9]+.x" -# - "main" -# paths: -# - 'doc/**' -# - '.github/workflows/docs.yaml' -# - 'README.md' -# push: -# branches: -# - "[0-9]+.[0-9]+" -# - "[0-9]+.x" -# - "*_actions" -# - "main" -# paths: -# - 'doc/**' -# - '.github/workflows/docs.yaml' -# - 'README.md' -# -# permissions: -# contents: read -# -# jobs: -# docs: -# name: "Generate docs Pimcore Docs Generator" -# runs-on: "ubuntu-latest" -# steps: -# - name: "Checkout code" -# uses: "actions/checkout@v4" -# with: -# ref: ${{ github.event.pull_request.head.sha }} -# -# - name: "Checkout Docs Generator" -# uses: "actions/checkout@v4" -# with: -# repository: "pimcore/docs-generator" -# ref: "main" -# path: "./docs-generator" -# token: ${{ secrets.DOCS_GENERATOR_ACCESS_TOKEN }} -# -# - name: "Install Node" -# uses: actions/setup-node@v4 -# with: -# node-version: 'lts/*' -# registry-url: 'https://registry.npmjs.org' -# -# - name: Prepare Docs -# working-directory: "./docs-generator" -# run: | -# mkdir docs -# # copy docs to working directory -# cp -r ../doc ./docs/ -# -# # copy readme to working directory -# cp -r ../README.md ./docs/ -# -# # copy index page -# cp bin/resources/00_index_empty.md ./docs/00_index.md -# -# # use special docusaurus config (to exclude search plugin) and check for broken links -# # mv docusaurus.config.js.repos-tests docusaurus.config.js -# -# - name: Build Docs -# working-directory: "./docs-generator" -# run: | -# npm install -# npm run build -# diff --git a/.github/workflows/new-docs.yml b/.github/workflows/docs.yml similarity index 65% rename from .github/workflows/new-docs.yml rename to .github/workflows/docs.yml index 6c98c21..c91e0a4 100644 --- a/.github/workflows/new-docs.yml +++ b/.github/workflows/docs.yml @@ -1,14 +1,14 @@ name: "Documentation (Reusable)" on: - pull_request_target: + pull_request: branches: - "[0-9]+.[0-9]+" - "[0-9]+.x" - "docs_actions" paths: - "doc/**" - - ".github/workflows/new-docs.yml" + - ".github/workflows/docs.yml" - "README.md" push: branches: @@ -17,7 +17,7 @@ on: - "docs_actions" paths: - "doc/**" - - ".github/workflows/new-docs.yml" + - ".github/workflows/docs.yml" - "README.md" permissions: @@ -25,8 +25,6 @@ permissions: jobs: docs: - uses: pimcore/workflows-collection-public/.github/workflows/reusable-docs.yaml@reusable-workflows + uses: pimcore/workflows-collection-public/.github/workflows/reusable-docs.yaml@main with: docs_path: "doc" - secrets: - DOCS_GENERATOR_ACCESS_TOKEN: ${{ secrets.DOCS_GENERATOR_ACCESS_TOKEN }} diff --git a/.github/workflows/osv-checks.yaml b/.github/workflows/osv-checks.yaml index 67b7174..f186c92 100644 --- a/.github/workflows/osv-checks.yaml +++ b/.github/workflows/osv-checks.yaml @@ -17,10 +17,8 @@ jobs: fail-fast: false matrix: include: - - { php-version: 8.1, platform-version: 'v2022.0' } - - { php-version: 8.2, platform-version: 'v2023.3' } - { php-version: 8.3, platform-version: 'v2024.4' } - - { php-version: 8.4, platform-version: '2025.x' } + - { php-version: 8.4, platform-version: 'v2025.4' } with: php-version: ${{ matrix.php-version }} platform-version: ${{ matrix.platform-version }}