From ba363e1df9a337934a9b558154e0f43aaffc6c1d Mon Sep 17 00:00:00 2001 From: Brenden Matthews Date: Fri, 14 Oct 2022 08:13:31 -0500 Subject: [PATCH] Add man page to releases. In addition to building an appimage for each commit to main and release, we'll include the man page so people can grab it without having to install pandoc. This addresses #1247 and #1254. --- .github/workflows/publish-appimage.yml | 13 +++++++++++-- appimage/build.sh | 4 ++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-appimage.yml b/.github/workflows/publish-appimage.yml index 3f7abff5..ab3f7cf3 100644 --- a/.github/workflows/publish-appimage.yml +++ b/.github/workflows/publish-appimage.yml @@ -23,7 +23,6 @@ jobs: sudo apt-get install -yqq --no-install-recommends \ audacious-dev \ cmake \ - docbook2x \ gawk \ lcov \ libaudclient-dev \ @@ -50,7 +49,11 @@ jobs: libxml2-dev \ libxmmsclient-dev \ libxnvctrl-dev \ - ncurses-dev + ncurses-dev \ + pandoc \ + python3 \ + && + pip3 install --upgrade pyyaml - name: Checkout uses: actions/checkout@v3 - name: Import GPG Deploy Key @@ -69,6 +72,11 @@ jobs: with: name: conky-x86_64.AppImage.sha256 path: conky-x86_64.AppImage.sha256 + - name: Upload man page artifact + uses: actions/upload-artifact@v3 + with: + name: conky.1 + path: conky.1 - name: Create Conky Release id: create_release uses: softprops/action-gh-release@v1 @@ -81,3 +89,4 @@ jobs: files: | conky-x86_64.AppImage conky-x86_64.AppImage.sha256 + conky.1 diff --git a/appimage/build.sh b/appimage/build.sh index c4818b52..3716bfc0 100755 --- a/appimage/build.sh +++ b/appimage/build.sh @@ -34,6 +34,7 @@ cmake \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DRELEASE=ON \ -DBUILD_AUDACIOUS=ON \ + -DBUILD_DOCS=ON \ -DBUILD_HTTP=ON \ -DBUILD_ICAL=ON \ -DBUILD_ICONV=ON \ @@ -80,3 +81,6 @@ do done mv conky*.AppImage* "$OLD_CWD" + +# Copy the latest man page, which will be attached to releases +mv doc/conky.1 "$OLD_CWD"