build: Fix manpage generation #3729
Conversation
|
Build succeeded.
|
| @@ -75,7 +75,7 @@ script: | |||
| - travis_wait ../project/script/validate/vendor | |||
| - GOOS=linux script/setup/install-dev-tools | |||
| - go build -i . | |||
| - make check | |||
There was a problem hiding this comment.
It looks like this needs to be skipped for Darwin
There was a problem hiding this comment.
Changed to do lower on, and with a check for TRAVIS_GOOS=linux
seemethere
force-pushed
the
fix_man
branch
2 times, most recently
from
6c73bba
to
c53d896
Compare
|
Build succeeded.
|
Codecov Report
@@ Coverage Diff @@
## master #3729 +/- ##
=======================================
Coverage 42.13% 42.13%
=======================================
Files 131 131
Lines 14474 14474
=======================================
Hits 6099 6099
Misses 7467 7467
Partials 908 908
Continue to review full report at Codecov.
|
Makefile
Outdated
| @@ -82,7 +82,7 @@ TEST_REQUIRES_ROOT_PACKAGES=$(filter \ | |||
|
|
|||
| # Project binaries. | |||
| COMMANDS=ctr containerd containerd-stress | |||
| MANPAGES=ctr.1 containerd.1 containerd-config.1 containerd-config.toml.5 | |||
| MANPAGES=containerd-config.1 containerd-config.toml.5 | |||
There was a problem hiding this comment.
if these two generated manpages aren't in the $MANPAGES list, then the install-man target will not install them to $(DESTDIR)/man. Can probably solve with some other target that looks for content in man/ but will need to be fixed.
There was a problem hiding this comment.
Re-added those manpages back to this MANPAGES variable.
Seems to be that docs/man/ctr.1.md and docs/man/containerd.1.md were removed in containerd#3637 and were not updated correctly in the Makefile, leading to build failures like: + make man make: *** No rule to make target `man/ctr.1', needed by `man'. Stop. Changes the gen-manpages command to be specific on which manpages are to be generated. Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
|
Ended up changing man/containerd.1: FORCE
@echo "$(WHALE) $@"
go run cmd/gen-manpages/main.go containerd man/
man/ctr.1: FORCE
@echo "$(WHALE) $@"
go run cmd/gen-manpages/main.go ctr man/Which will basically make it so that none of the other targets actually need changing. The |
|
Build succeeded.
|
Seems to be that docs/man/ctr.1.md and docs/man/containerd.1.md were
removed in #3637 and were not updated correctly in the Makefile, leading
to build failures like:
Changes the gen-manpages command to be specific on which manpages are to
be generated.
Also added a check in the travis yml so that this gets checked on PRs
Signed-off-by: Eli Uriegas eli.uriegas@docker.com