Merge pull request #24950 from dnephin/make-manpages-in-container
Make manpages in a container when creating deb/rpm
This commit is contained in:
commit
1e83886dd5
3 changed files with 3 additions and 5 deletions
|
@ -35,8 +35,7 @@ set -e
|
|||
debDate="$(date --rfc-2822)"
|
||||
|
||||
# if go-md2man is available, pre-generate the man pages
|
||||
./man/generate.sh || true
|
||||
# TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this
|
||||
make manpages
|
||||
|
||||
builderDir="contrib/builder/deb/${PACKAGE_ARCH}"
|
||||
pkgs=( $(find "${builderDir}/"*/ -type d) )
|
||||
|
|
|
@ -51,8 +51,7 @@ set -e
|
|||
rpmDate="$(date +'%a %b %d %Y')"
|
||||
|
||||
# if go-md2man is available, pre-generate the man pages
|
||||
./man/generate.sh || true
|
||||
# TODO decide if it's worth getting go-md2man in _each_ builder environment to avoid this
|
||||
make manpages
|
||||
|
||||
# Convert the CHANGELOG.md file into RPM changelog format
|
||||
VERSION_REGEX="^\W\W (.*) \((.*)\)$"
|
||||
|
|
|
@ -60,7 +60,7 @@ bundle_ubuntu() {
|
|||
cp contrib/completion/fish/docker.fish "$DIR/etc/fish/completions/"
|
||||
|
||||
# Include man pages
|
||||
man/generate.sh
|
||||
make manpages
|
||||
manRoot="$DIR/usr/share/man"
|
||||
mkdir -p "$manRoot"
|
||||
for manDir in man/man?; do
|
||||
|
|
Loading…
Reference in a new issue