Merge to master before running tests

php · Jan 30, 2025 · a837256 · a837256
1 parent b12b9bb
commit a837256
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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 }}