From a837256a8a0a6960e8f840c1fbfb396dae481b2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Thu, 30 Jan 2025 15:43:59 -0300 Subject: [PATCH 01/20] Merge to master before running tests --- .github/workflows/integrate.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 042d11ece..388bcf09e 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -59,4 +59,6 @@ jobs: php doc-base/scripts/qa/section-order.php - name: "Build documentation for ${{ matrix.language }}" - run: "php doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=${{ matrix.language }}" + run: | + git -C doc-base merge --no-ff --no-commit master + php doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=${{ matrix.language }} From 8de08ff070a977a09b9ce9364c8977ba5935fa4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Thu, 30 Jan 2025 16:45:21 -0300 Subject: [PATCH 02/20] Fetch master before merging --- .github/workflows/integrate.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 388bcf09e..fbadbfd7d 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -60,5 +60,6 @@ jobs: - name: "Build documentation for ${{ matrix.language }}" run: | + git -C doc-base fetch origin master git -C doc-base merge --no-ff --no-commit master php doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=${{ matrix.language }} From bb3aa3dcbac1117b4fe9bb94fb036a15ea4bf111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Thu, 30 Jan 2025 16:48:45 -0300 Subject: [PATCH 03/20] Full name when local merging --- .github/workflows/integrate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index fbadbfd7d..11383f622 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -61,5 +61,5 @@ jobs: - name: "Build documentation for ${{ matrix.language }}" run: | git -C doc-base fetch origin master - git -C doc-base merge --no-ff --no-commit master + git -C doc-base merge --no-ff --no-commit origin/master php doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=${{ matrix.language }} From 06fe0d5bf782cb3dc3e4a88094b41fbe3f94e5e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Thu, 30 Jan 2025 16:57:31 -0300 Subject: [PATCH 04/20] Pull instead of fetch --- .github/workflows/integrate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 11383f622..89134c58d 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -60,6 +60,6 @@ jobs: - name: "Build documentation for ${{ matrix.language }}" run: | - git -C doc-base fetch origin master + git -C doc-base pull origin master git -C doc-base merge --no-ff --no-commit origin/master php doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=${{ matrix.language }} From 0c3aed2e8d7616cf7568b84916bc84cb38778411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Thu, 30 Jan 2025 17:26:20 -0300 Subject: [PATCH 05/20] Trying pulling all history on checkout --- .github/workflows/integrate.yaml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 89134c58d..599a54205 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -38,6 +38,7 @@ jobs: uses: "actions/checkout@v4" with: path: "doc-base" + fetch-depth: 0 - name: "Checkout php/doc-${{ matrix.language }}" uses: "actions/checkout@v4" @@ -58,8 +59,8 @@ jobs: php doc-base/scripts/qa/extensions.xml.php --check php doc-base/scripts/qa/section-order.php + - name: "Merge with master (to care for concurrent PRs)" + run: "git -C doc-base merge --no-ff --no-commit master" + - name: "Build documentation for ${{ matrix.language }}" - run: | - git -C doc-base pull origin master - git -C doc-base merge --no-ff --no-commit origin/master - php doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=${{ matrix.language }} + run: "php doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=${{ matrix.language }}" From 20a517aa7fbb03fd80a23873806bcc01d640845a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Thu, 30 Jan 2025 17:28:32 -0300 Subject: [PATCH 06/20] Suggested in error --- .github/workflows/integrate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 599a54205..30739e845 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -60,7 +60,7 @@ jobs: php doc-base/scripts/qa/section-order.php - name: "Merge with master (to care for concurrent PRs)" - run: "git -C doc-base merge --no-ff --no-commit master" + run: "git -C doc-base merge --no-ff --no-commit origin/master" - name: "Build documentation for ${{ matrix.language }}" run: "php doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=${{ matrix.language }}" From 7458d5c51fcadec23c4e036d52bc8de549e7d7e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Thu, 30 Jan 2025 18:06:17 -0300 Subject: [PATCH 07/20] Reorder and more simetric names --- .github/workflows/integrate.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 30739e845..864c217ff 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -34,33 +34,33 @@ jobs: - "zh" steps: - - name: "Checkout" + - name: "Checkou doc-baset" uses: "actions/checkout@v4" with: path: "doc-base" fetch-depth: 0 - - name: "Checkout php/doc-${{ matrix.language }}" + - name: "Checkout doc-${{ matrix.language }}" uses: "actions/checkout@v4" with: path: "${{ matrix.language }}" repository: "php/doc-${{ matrix.language }}" - - name: "Checkout php/doc-en as fallback" + - name: "Checkout doc-en (fallback)" if: "matrix.language != 'en'" uses: "actions/checkout@v4" with: path: "en" repository: "php/doc-en" + - name: "Merge doc-base with master (concurrent PRs)" + run: "git -C doc-base merge --no-ff --no-commit origin/master" + - name: "Run QA scripts for EN docs" if: "matrix.language == 'en'" run: | php doc-base/scripts/qa/extensions.xml.php --check php doc-base/scripts/qa/section-order.php - - name: "Merge with master (to care for concurrent PRs)" - run: "git -C doc-base merge --no-ff --no-commit origin/master" - - name: "Build documentation for ${{ matrix.language }}" run: "php doc-base/configure.php --disable-libxml-check --enable-xml-details --redirect-stderr-to-stdout --with-lang=${{ matrix.language }}" From a614be8465fd2d4398f7a14bdd005394af2f1234 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Fri, 31 Jan 2025 14:04:00 -0300 Subject: [PATCH 08/20] Typo and cosmetics --- .github/workflows/integrate.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 864c217ff..ac74230e2 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -34,7 +34,7 @@ jobs: - "zh" steps: - - name: "Checkou doc-baset" + - name: "Checkout doc-base" uses: "actions/checkout@v4" with: path: "doc-base" @@ -53,7 +53,7 @@ jobs: path: "en" repository: "php/doc-en" - - name: "Merge doc-base with master (concurrent PRs)" + - name: "Pull merged doc-base changes from master" run: "git -C doc-base merge --no-ff --no-commit origin/master" - name: "Run QA scripts for EN docs" From bf61fe24e10cf41c28dd14452e6dcb68fde908ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Mon, 3 Feb 2025 11:07:50 -0300 Subject: [PATCH 09/20] Fix 'Committer identity unknown' and show merge diff --- .github/workflows/integrate.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index ac74230e2..036222fc1 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -11,9 +11,7 @@ on: jobs: build: name: "Build" - runs-on: "ubuntu-latest" - continue-on-error: true strategy: @@ -53,8 +51,10 @@ jobs: path: "en" repository: "php/doc-en" - - name: "Pull merged doc-base changes from master" - run: "git -C doc-base merge --no-ff --no-commit origin/master" + - name: "Merge doc-base changes from master" + run: | + git -C doc-base -c user.email="()" -c user.name="()" merge --no-ff --no-commit origin/master + git -C doc-base diff --cached - name: "Run QA scripts for EN docs" if: "matrix.language == 'en'" From c7eaae01e1a39ea411b2926645f782cc2adcd0fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Mon, 3 Feb 2025 11:20:17 -0300 Subject: [PATCH 10/20] Merge to local master --- .github/workflows/integrate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 036222fc1..9ac9ea2b0 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -53,7 +53,7 @@ jobs: - name: "Merge doc-base changes from master" run: | - git -C doc-base -c user.email="()" -c user.name="()" merge --no-ff --no-commit origin/master + git -C doc-base -c user.email="()" -c user.name="()" merge --no-ff --no-commit master git -C doc-base diff --cached - name: "Run QA scripts for EN docs" From 833ad1d4c5b4c6e66f6686f0d36ddf362d72d3b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Mon, 3 Feb 2025 11:36:11 -0300 Subject: [PATCH 11/20] Fetch master history --- .github/workflows/integrate.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 9ac9ea2b0..3e839c1f8 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -53,6 +53,7 @@ jobs: - name: "Merge doc-base changes from master" run: | + git -C doc-base fetch master git -C doc-base -c user.email="()" -c user.name="()" merge --no-ff --no-commit master git -C doc-base diff --cached From c6d4ce0bdc41858683b59111556034566e2e9c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Mon, 3 Feb 2025 11:38:16 -0300 Subject: [PATCH 12/20] Maybe origin is missing --- .github/workflows/integrate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 3e839c1f8..fe7bd4c7e 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -53,7 +53,7 @@ jobs: - name: "Merge doc-base changes from master" run: | - git -C doc-base fetch master + git -C doc-base fetch origin/master git -C doc-base -c user.email="()" -c user.name="()" merge --no-ff --no-commit master git -C doc-base diff --cached From d1c7893636653f5d6e3e2f253becf4f3e359d5bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Mon, 3 Feb 2025 11:49:27 -0300 Subject: [PATCH 13/20] Space --- .github/workflows/integrate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index fe7bd4c7e..d79890fe6 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -53,7 +53,7 @@ jobs: - name: "Merge doc-base changes from master" run: | - git -C doc-base fetch origin/master + git -C doc-base fetch origin master git -C doc-base -c user.email="()" -c user.name="()" merge --no-ff --no-commit master git -C doc-base diff --cached From 938e3874837200d5bb07a86041694d2068101fbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Mon, 3 Feb 2025 11:54:43 -0300 Subject: [PATCH 14/20] Full refname on merge, and debug info --- .github/workflows/integrate.yaml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index d79890fe6..017e94ed6 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -53,9 +53,14 @@ jobs: - name: "Merge doc-base changes from master" run: | - git -C doc-base fetch origin master - git -C doc-base -c user.email="()" -c user.name="()" merge --no-ff --no-commit master - git -C doc-base diff --cached + cd doc-base + ls + git status + git remote -v + git fetch origin master + gir branch + git -c user.email="()" -c user.name="()" merge --no-ff --no-commit origin/master + git diff --cached - name: "Run QA scripts for EN docs" if: "matrix.language == 'en'" From b59b306602a562faf19b081cf6ddb8809dd09d5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Mon, 3 Feb 2025 11:58:29 -0300 Subject: [PATCH 15/20] Typo and more debug --- .github/workflows/integrate.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 017e94ed6..db85bee2f 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -53,12 +53,12 @@ jobs: - name: "Merge doc-base changes from master" run: | - cd doc-base ls - git status - git remote -v + cd doc-base git fetch origin master - gir branch + echo "status" ; git status + echo "remote" ; git remote -v + echo "branch" ; git branch git -c user.email="()" -c user.name="()" merge --no-ff --no-commit origin/master git diff --cached From b1436de552d6bb3d7d39816c0689366b2fcc8769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Mon, 3 Feb 2025 12:15:05 -0300 Subject: [PATCH 16/20] Testing if is possible to checkout master via refs, and return back to detached checkout --- .github/workflows/integrate.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index db85bee2f..64089f36b 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -53,12 +53,12 @@ jobs: - name: "Merge doc-base changes from master" run: | - ls + env cd doc-base - git fetch origin master - echo "status" ; git status - echo "remote" ; git remote -v - echo "branch" ; git branch + git branch + git checkout master + git switch - + git branch git -c user.email="()" -c user.name="()" merge --no-ff --no-commit origin/master git diff --cached From 90677d9f7723fbd2dd39a55339cc94f340deabf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Mon, 3 Feb 2025 12:26:13 -0300 Subject: [PATCH 17/20] Returnt to detached HEAD state of master checkout --- .github/workflows/integrate.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index 64089f36b..cfdcab35a 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -56,10 +56,14 @@ jobs: env cd doc-base git branch + git log -n 3 git checkout master - git switch - git branch - git -c user.email="()" -c user.name="()" merge --no-ff --no-commit origin/master + git log -n 3 + git switch --detach - + git branch + git log -n 3 + git -c user.email="()" -c user.name="()" merge --no-ff --no-commit master git diff --cached - name: "Run QA scripts for EN docs" From 8a25606a3162c1bb5b6ac38bb57bfa6057e6a526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Mon, 3 Feb 2025 12:49:32 -0300 Subject: [PATCH 18/20] Change step to a error --- .github/workflows/integrate.yaml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index cfdcab35a..b3737408c 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -53,18 +53,14 @@ jobs: - name: "Merge doc-base changes from master" run: | - env + echo === This step will fail if the merge commit is not targeting master cd doc-base - git branch + echo === git log -n 3 git log -n 3 - git checkout master - git branch - git log -n 3 - git switch --detach - - git branch - git log -n 3 - git -c user.email="()" -c user.name="()" merge --no-ff --no-commit master - git diff --cached + echo === git show HEAD + git show HEAD + echo === git merge --no-ff --no-commit master + git merge --no-ff --no-commit origin/master - name: "Run QA scripts for EN docs" if: "matrix.language == 'en'" From c496e97c7b89e491b6b5d2179441ff9dba4cf13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Mon, 3 Feb 2025 12:50:45 -0300 Subject: [PATCH 19/20] Change step to a error --- .github/workflows/integrate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml index b3737408c..38b9c36bf 100644 --- a/.github/workflows/integrate.yaml +++ b/.github/workflows/integrate.yaml @@ -51,7 +51,7 @@ jobs: path: "en" repository: "php/doc-en" - - name: "Merge doc-base changes from master" + - name: "Ensure doc-base is correctly merged into master (debug)" run: | echo === This step will fail if the merge commit is not targeting master cd doc-base From b7b547b0877092f81a17eb7257cc634fa7ec49b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20L=20F=20S=20Bacci?= Date: Fri, 7 Feb 2025 09:34:18 -0300 Subject: [PATCH 20/20] Bump --- .gitignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8e5220c8b..9e537f6be 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,5 @@ sources.xml # File use to generate entities by configure script fileModHistory.php - # A plece for all temporary or generated files (idempotent build) temp/