[release/1.3] build: Fix manpage generation#3748
[release/1.3] build: Fix manpage generation#3748estesp merged 1 commit intocontainerd:release/1.3from
Conversation
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 <[email protected]> (cherry picked from commit 036db34) Signed-off-by: Eli Uriegas <[email protected]>
|
Build succeeded.
|
Codecov Report
@@ Coverage Diff @@
## release/1.3 #3748 +/- ##
===========================================
Coverage 45.6% 45.6%
===========================================
Files 116 116
Lines 11458 11458
===========================================
Hits 5225 5225
Misses 5334 5334
Partials 899 899
Continue to review full report at Codecov.
|
| - go build -i . | ||
| - make check | ||
| - if [ "$GOOS" = "linux" ]; then make check-protos check-api-descriptors; fi | ||
| - if [ "$TRAVIS_GOOS" = "linux" ]; then make man ; fi |
There was a problem hiding this comment.
what's the difference between GOOS and TRAVIS_GOOS, if both are used from .travis.yml?
There was a problem hiding this comment.
Yes, we should probably check what the differences are (if any) and clean up (if possible); either put a comment why use one over the other, or remove one of both (because it's definitely confusing)
There was a problem hiding this comment.
TRAVIS_GOOS is just defined in the env section and used in this yml, it has no other meaning. Not sure why GOOS is used above, but TRAVIS_GOOS should be used here since we set it and know what it is set to.
| - go build -i . | ||
| - make check | ||
| - if [ "$GOOS" = "linux" ]; then make check-protos check-api-descriptors; fi | ||
| - if [ "$TRAVIS_GOOS" = "linux" ]; then make man ; fi |
There was a problem hiding this comment.
Yes, we should probably check what the differences are (if any) and clean up (if possible); either put a comment why use one over the other, or remove one of both (because it's definitely confusing)
| dir := flag.Arg(1) | ||
| app, ok := apps[name] | ||
| if !ok { | ||
| return fmt.Errorf("Invalid application '%s'", name) |
There was a problem hiding this comment.
Guess this should've been lowercase
There was a problem hiding this comment.
I though the linters were complaining about this, maybe just a warning. Should fix upstream though if we have to, fine for now
There was a problem hiding this comment.
Yes; this is just a cherry-pick, but was also surprised the linter didn't make it fail
6 participants
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.
Same as #3729 but for the
release/1.3branchSigned-off-by: Eli Uriegas [email protected]
(cherry picked from commit 036db34)
Signed-off-by: Eli Uriegas [email protected]