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

[TASK] Use --minimal-test CLI option for documentation tests #171

Merged
merged 1 commit into from
Oct 1, 2024

Conversation

linawolf
Copy link
Member

@linawolf linawolf commented Oct 1, 2024

This allows us to control specific settings needed for mininmal tests (like setting only a single output format) or more for the future.

See also: TYPO3-Documentation/render-guides#765

Releases: main, 12.4, 11.5

This allows us to control specific settings needed for mininmal tests (like setting only a single output format) or more for the future.

See also: TYPO3-Documentation/render-guides#765

Releases: main, 12.4, 11.5
@linawolf linawolf self-assigned this Oct 1, 2024
@linawolf linawolf merged commit 3b9b3d4 into main Oct 1, 2024
4 checks passed
@linawolf linawolf deleted the task/test branch October 1, 2024 17:36
Copy link

github-actions bot commented Oct 1, 2024

The backport to 11.5 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply be5a3ed... [TASK] Use --minimal-test CLI option for documentation tests
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-11.5 11.5
# Navigate to the new working tree
cd .worktrees/backport-11.5
# Create a new branch
git switch --create backport-171-to-11.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick be5a3ed65f28ea825df14a1f1af87d3cad4021ee
# Push it to GitHub
git push --set-upstream origin backport-171-to-11.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-11.5

Then, create a pull request where the base branch is 11.5 and the compare/head branch is backport-171-to-11.5.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant