Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge to master before running tests #217

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open
Prev Previous commit
Next Next commit
Suggested in error
André L F S Bacci committed Jan 30, 2025

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 20a517aa7fbb03fd80a23873806bcc01d640845a
2 changes: 1 addition & 1 deletion .github/workflows/integrate.yaml
Original file line number Diff line number Diff line change
@@ -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 }}"