From 4544a6d59560683149d40a3a676c1134f0c51e41 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Tue, 19 May 2020 20:09:48 +0200 Subject: [PATCH 1/3] travis: build dist tarball after running tests This way, users get more detailed feedback about new test failures. related to #4086 --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 17bb6dd71..0cea2cf57 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,9 +34,10 @@ script: # # TODO(autotools-removal): autoconf build has to keep working until i3 4.19 # is released, so we keep building it in travis. - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${BASENAME} /bin/sh -c 'autoreconf -fi && mkdir -p build && cd build && (../configure || (cat config.log; false)) && make -j CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Werror -fno-common"' - - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${BASENAME} /bin/sh -c 'rm -rf build; mkdir -p build && cd build && CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Werror -fno-common" meson .. -Ddocs=true -Dmans=true -Db_sanitize=address && ninja -v && mkdir ../distbuild && cd ../distbuild && meson .. -Ddocs=true -Dmans=true && ninja -v dist' + - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${BASENAME} /bin/sh -c 'rm -rf build; mkdir -p build && cd build && CFLAGS="-Wformat -Wformat-security -Wextra -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Werror -fno-common" meson .. -Ddocs=true -Dmans=true -Db_sanitize=address && ninja -v' - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/check-spelling.pl - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${BASENAME} ./travis/run-tests.sh + - docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 -e CC ${BASENAME} /bin/sh -c 'rm -rf distbuild; mkdir distbuild && cd distbuild && meson .. -Ddocs=true -Dmans=true && ninja -v dist' - ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME} ./travis/debian-build.sh deb/debian-amd64/DIST - ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME_UBUNTU} ./travis/debian-build.sh deb/ubuntu-amd64/DIST - ./travis/skip-pkg.sh || docker run -v $PWD:/usr/src/i3/ -w /usr/src/i3 ${BASENAME_386} linux32 ./travis/debian-build.sh deb/debian-i386/DIST From be1065f62d156fb825f566b7e1e6ab4937dc9db4 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Tue, 19 May 2020 20:10:18 +0200 Subject: [PATCH 2/3] debian-build: s/build/distbuild/ related to #4086 --- travis/debian-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/travis/debian-build.sh b/travis/debian-build.sh index 1c34f46a7..6e66155a0 100755 --- a/travis/debian-build.sh +++ b/travis/debian-build.sh @@ -5,7 +5,7 @@ set -x DEST=$1 -cd build +cd distbuild # unpack dist tarball mkdir -p "${DEST}" tar xf meson-dist/*.tar.xz -C "${DEST}" --strip-components=1 From abf9b18f12522eec91a5a7730975b8bfc3fd7c0b Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Tue, 19 May 2020 20:22:46 +0200 Subject: [PATCH 3/3] docs.sh: no longer rely on now-deleted debian/i3-wm.{manpages,docs} related to #4086 --- travis/docs.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/travis/docs.sh b/travis/docs.sh index 043104a90..501946faf 100755 --- a/travis/docs.sh +++ b/travis/docs.sh @@ -3,20 +3,24 @@ set -e set -x -for f in $(grep '\.html$' debian/i3-wm.docs | grep -v 'docs/refcard.html' | grep -v 'docs/lib-i3test') +# TODO: install the docs via meson, inject styles with an option + +for f in $(sed -n "s/^\s*'\(docs\/.*\)',$/\1/gp" meson.build | grep -vF .) do asciidoc -a linkcss -a stylesdir=https://i3wm.org/css -a scriptsdir=https://i3wm.org/js --backend=xhtml11 -f docs/asciidoc-git.conf $(dirname $f)/$(basename $f .html) done + ./docs/i3-pod2html --stylesurl=https://i3wm.org/css i3-dmenu-desktop man/i3-dmenu-desktop.html ./docs/i3-pod2html --stylesurl=https://i3wm.org/css i3-save-tree man/i3-save-tree.html -./docs/i3-pod2html --stylesurl=https://i3wm.org/css build/testcases/lib/i3test.pm docs/lib-i3test.html +./docs/i3-pod2html --stylesurl=https://i3wm.org/css build/i3test.pm docs/lib-i3test.html ./docs/i3-pod2html --stylesurl=https://i3wm.org/css testcases/lib/i3test/Test.pm docs/lib-i3test-test.html -for file in $(sed 's/\.1$/.man/g' debian/i3-wm.manpages) + +for file in $(sed -n "s/^\s*'\(man\/.*\).man',$/\1.man/gp" meson.build) do [ -f "$file" ] && asciidoc -a linkcss -a stylesdir=https://i3wm.org/css -a scriptsdir=https://i3wm.org/js --backend=xhtml11 -f docs/asciidoc-git.conf "$file" done mkdir -p deb/COPY-DOCS -cp $(tr "\n" ' ' < debian/i3-wm.docs) deb/COPY-DOCS/ -cp $(sed 's/\.1$/.html/g' debian/i3-wm.manpages | tr "\n" ' ') deb/COPY-DOCS/ +cp $(sed -n "s/^\s*'\(docs\/.*\)',$/\1/gp" meson.build | grep -F .) deb/COPY-DOCS/ +cp $(sed -n "s/^\s*'\(man\/.*\).man',$/\1.html/gp" meson.build) deb/COPY-DOCS/