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

nix/tests: run test help.sh only if nix is built with documentation (backport #11729) #11742

Open
wants to merge 1 commit into
base: 2.18-maintenance
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 23, 2024

Motivation

tests/functional/help.sh calls nix-* commands with option --help
if nix is built without documentation the option --help throws an error because the man page it wants to display is missing

Context

With disabled docs nix can not be built because of a failing test.

Priorities and Process

Add 👍 to pull requests you find important.

The Nix maintainer team uses a GitHub project board to schedule and track reviews.


This is an automatic backport of pull request #11729 done by [Mergify](https://mergify.com).

tests/functional/help.sh calls nix-* commands with option --help
if nix is built without documentation the option --help throws an error
because the man page it wants to display is missing

(cherry picked from commit 85b0cd3)

# Conflicts:
#	configure.ac
#	package.nix
#	tests/functional/local.mk
Copy link
Author

mergify bot commented Oct 23, 2024

Cherry-pick of 85b0cd3 has failed:

On branch mergify/bp/2.18-maintenance/pr-11729
Your branch is up to date with 'origin/2.18-maintenance'.

You are currently cherry-picking commit 85b0cd320.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   configure.ac
	deleted by us:   package.nix
	both modified:   tests/functional/local.mk

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@github-actions github-actions bot added the with-tests Issues related to testing. PRs with tests have some priority label Oct 23, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts merge-queue with-tests Issues related to testing. PRs with tests have some priority
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant