Skip to content

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

Closed
mergify[bot] wants to merge 1 commit into2.18-maintenancefrom
mergify/bp/2.18-maintenance/pr-11729
Closed

nix/tests: run test help.sh only if nix is built with documentation (backport #11729)#11742
mergify[bot] wants to merge 1 commit into2.18-maintenancefrom
mergify/bp/2.18-maintenance/pr-11729

Conversation

@mergify
Copy link
Contributor

@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
@mergify
Copy link
Contributor 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
@Mic92
Copy link
Member

Mic92 commented Jan 7, 2025

This nix version is eol.

@Mic92 Mic92 closed this Jan 7, 2025
@Mic92 Mic92 deleted the mergify/bp/2.18-maintenance/pr-11729 branch January 7, 2025 05:56
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.

2 participants

Comments