GH actions/checkout dont always merge into current main/master

.github/workflows/build.yaml

@@ -1,4 +1,4 @@
-# See https://docs.github.com/en/actions.
+
 name: Build
 
 on:
@@ -13,28 +13,78 @@ jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
-
     steps:
-      # See https://github.com/actions/checkout.
-      - name: Checkout doc-pt_br
-        uses: actions/checkout@v3
+
+      - name: Checkout doc-base
+        uses: actions/checkout@v7
         with:
-          path: pt_br
+          repository: php/doc-base
+          path: doc-base
 
       - name: Checkout doc-en
-        uses: actions/checkout@v3
+        uses: actions/checkout@v7
         with:
           repository: php/doc-en
           path: en
 
-      - name: Checkout doc-base
-        uses: actions/checkout@v3
+        # GH actions/checkout, automatically merges, but tends to get stuck in the past.
+        # See: https://github.com/php/doc-base/pull/329
+
+      - name: Checkout and merge doc-pt_br
+        uses: actions/checkout@v7
         with:
-          repository: php/doc-base
-          path: doc-base
+          path: pt_br
+
+      - name: Build manual.xml
+        run: |
+          php doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=pt_br 2>&1
+          sha1sum doc-base/temp/manual.xml
+
+
+
+      - name: Alternative path, uses userland merge instead
+        run:  rm -rf pt_br
+
+      - name: Checkout doc-pt_br
+        uses: actions/checkout@v7
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+          path: pt_br
+          ref: ${{ github.event.pull_request.head.sha }}
+
+      - name: Merge doc-pt_br
+        run: |
+          # Merge into main/master from *current* names/SHAS.
+          #
+          # - github.event.pull_request.base.ref : main/master
+          # - github.event.pull_request.head.sha : PR head
+          #
+          # Does not work:
+          # - actions/checkout without fetch-depth / fetch-tags
+          # - git fetch by github.event.pull_request.head.ref
+
+          cd pt_br
+          git show-ref -d --head
+          echo
+
+          # Give the detached head a name, to avoid warnings
+          git switch -c commit-${{ github.event.pull_request.head.sha }}
+          echo
+
+          # Checkout main/master, by name, to always reach it's last commit
+          git checkout ${{ github.event.pull_request.base.ref }}
+          echo
+
+          # Squash and merge, from the branch SHA
+          git merge --squash ${{ github.event.pull_request.head.sha }}
+          echo
 
-      - name: Quality Assurance scripts
-        run: php doc-base/scripts/qa/extensions.xml.php --check
+          git status --short
+          git diff --stat
+          echo
 
-      - name: Build documentation for pt_br
-        run: php doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=pt_br
+      - name: Build manual.xml, again
+        run: |
+          php doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=pt_br 2>&1
+          sha1sum doc-base/temp/manual.xml