Update

Author: dmnks

.github/workflows/jekyll-gh-pages.yml

@@ -28,22 +28,21 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Setup Pages
-        id: pages
-        uses: actions/configure-pages@v5
 
       - name: Test
         run: |
-          podman run -v $PWD:/srv:z --workdir /srv -it --rm fedora \
-            sh -c 'dnf install -y scd2html; \
-                   pre="---\nlayout: default\ntitle: Hello\n---\n"; \
-                   for file in docs/man/*.scd; do \
-                     out=$(basename $file | sed "s/scd$/html/"); \
-                     echo -e "$pre" > docs/man/$out; \
-                     scd2html -f < $file >> docs/man/$out; \
-                   done'
 
-          sed -i 's|<b>\(rpm[^<]*\)</b>(\(.\))|<a href="\1.\2.html">\1(\2)</a>|g' docs/man/rpm*.html
+          podman build --target base --tag rpm -f tests/Dockerfile .
+          mkdir _build
+          podman run -v $PWD:/srv:z --workdir /srv/_build --rm rpm sh -c \
+            "cmake .. && make man-html"
+
+          # sed -i 's|<b>\(rpm[^<]*\)</b>(\(.\))|<a href="\1.\2.html">\1(\2)</a>|g' docs/man/rpm*.html
+          mv _build/docs/man/*.html docs/man/
+
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v5
 
       - name: Build with Jekyll
         uses: actions/jekyll-build-pages@v1

docs/man/CMakeLists.txt

@@ -19,6 +19,19 @@ foreach(man ${manuals})
 endforeach()
 add_custom_target(man ALL DEPENDS ${manuals})
 
+set(manuals-html ${manuals})
+list(TRANSFORM manuals-html APPEND .html)
+configure_file(post.sh post.sh @ONLY)
+foreach(man ${manuals})
+	add_custom_command(OUTPUT ${man}.html
+		COMMAND scd2html -f
+			< ${CMAKE_CURRENT_SOURCE_DIR}/${man}.scd
+			> ${man}.html
+		COMMAND ./post.sh ${man}.html
+		DEPENDS ${man}.scd)
+endforeach()
+add_custom_target(man-html ALL DEPENDS ${manuals-html})
+
 # Install manuals for the enabled features
 set(manuals ${core})
 if (ENABLE_PLUGINS)

docs/man/post.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+FILE=$1
+NAME=$(echo "$FILE" | sed 's/^\(.\+\)\.\(.\+\)\.html$/\1(\2)/')
+FRONT_MATTER="\
+---
+layout: default
+title: rpm.org - $NAME
+---
+"
+cat <(echo "$FRONT_MATTER") $1 > $1.tmp
+mv $1.tmp $1

tests/Dockerfile.fedora

@@ -52,6 +52,7 @@ RUN dnf -y install \
   dwz \
   fsverity-utils fsverity-utils-devel \
   scdoc \
+  scd2html \
   sequoia-sq \
   libasan \
   libubsan