From 697b04046185b03d68e62cff8adcc12fa2f3f595 Mon Sep 17 00:00:00 2001 From: lacatoire Date: Mon, 14 Sep 2026 10:05:52 +0200 Subject: [PATCH 1/2] ci: use the shared check-en-revision.php from doc-base --- .github/workflows/check-en-revision.yml | 48 +++++++++++++------------ 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/.github/workflows/check-en-revision.yml b/.github/workflows/check-en-revision.yml index f61e022a5..eb81b9e2d 100644 --- a/.github/workflows/check-en-revision.yml +++ b/.github/workflows/check-en-revision.yml @@ -1,7 +1,10 @@ # https://docs.github.com/en/actions -# Checks that the EN-Revision comment of the .xml files changed in a PR points to -# the latest doc-en commit for that file. Emits a ::error annotation and fails if -# the hash is missing, wrong, from another file, or outdated. +# Checks that the EN-Revision tag of the .xml files changed in a PR matches +# the latest commit hash of the corresponding doc-en file. The script emits +# its own ::error annotations. +# +# The script is the one from doc-base, shared by all translations, and no +# longer an inline bash snippet local to this workflow. name: "Structure" @@ -16,38 +19,39 @@ permissions: jobs: revision: name: "Check EN-Revision" - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 steps: - # The explicit ref takes the real head of the pull request, not the merge - # commit actions/checkout builds by default: that one has master as its - # second parent, so the diff below would also list every file landed on - # master since the last push to the pull request. + # pt_BR/, en/ and doc-base/ side by side: this is the layout expected by + # the doc-base scripts, the same as the one the build workflow uses. The + # explicit ref takes the real head of the pull request, not the merge commit + # actions/checkout builds by default: that one has master as its second + # parent, so the diff below would also list every file landed on master + # since the last push of the PR. - name: "Checkout translation" - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: + path: pt_BR ref: ${{ github.event.pull_request.head.sha }} fetch-depth: 0 - name: "Checkout php/doc-en" - uses: actions/checkout@v4 + uses: actions/checkout@v7 with: path: en repository: php/doc-en fetch-depth: 0 + - name: "Checkout php/doc-base" + uses: actions/checkout@v7 + with: + path: doc-base + repository: php/doc-base + - name: "Check EN-Revision" run: | BASE="${{ github.event.pull_request.base.sha }}" - git fetch --no-tags --depth=1 origin "$BASE" - fail=0 - while IFS= read -r f; do - [ -f "$f" ] && [ -f "en/$f" ] || continue - declared=$(grep -oiP 'EN-Revision:\s*\K[0-9a-f]+' "$f" | head -1 || true) - latest=$(git -C en log -1 --format=%H -- "$f") - if [ "$declared" != "$latest" ]; then - echo "::error file=$f::EN-Revision ${declared:-missing} != latest doc-en commit $latest" - fail=1 - fi - done < <(git diff --name-only "$BASE"...HEAD -- '*.xml') - exit $fail + git -C pt_BR fetch --no-tags --depth=1 origin "$BASE" + git -C pt_BR diff --name-only "$BASE"...HEAD -- '*.xml' \ + | php8.3 doc-base/scripts/translation/check-en-revision.php \ + --lang=pt_BR --github From d78937c8b3d7e8fae6487ca62b8264284693cae9 Mon Sep 17 00:00:00 2001 From: lacatoire Date: Mon, 14 Sep 2026 10:09:04 +0200 Subject: [PATCH 2/2] fix: use ubuntu-latest instead of a pinned Ubuntu version --- .github/workflows/check-en-revision.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/check-en-revision.yml b/.github/workflows/check-en-revision.yml index eb81b9e2d..ac4e77c1a 100644 --- a/.github/workflows/check-en-revision.yml +++ b/.github/workflows/check-en-revision.yml @@ -19,7 +19,7 @@ permissions: jobs: revision: name: "Check EN-Revision" - runs-on: ubuntu-24.04 + runs-on: ubuntu-latest steps: # pt_BR/, en/ and doc-base/ side by side: this is the layout expected by # the doc-base scripts, the same as the one the build workflow uses. The