From b91f8c354b60f9db22d4ad65a1e6f72b13c8b693 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Tue, 20 Aug 2024 11:08:30 -0400 Subject: CI add pandoc (and bug fixes) (#35) * Fix pandoc command regression * Add space between destination and input * Add pandoc dependency * Dump output of indexed files --- .github/workflows/cmake-multi-platform.yml | 7 ++++++- src/stasis_indexer.c | 1 + tests/rt_generic.sh | 12 ++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 0a30f4c..79cdf87 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -45,7 +45,12 @@ jobs: - name: Install Linux dependencies if: matrix.os == 'ubuntu-latest' run: > - sudo apt install -y libcurl4-openssl-dev libxml2-dev libxml2-utils rsync + sudo apt install -y + libcurl4-openssl-dev + libxml2-dev + libxml2-utils + pandoc + rsync - name: Configure CMake run: > diff --git a/src/stasis_indexer.c b/src/stasis_indexer.c index 2a3c044..4f57a86 100644 --- a/src/stasis_indexer.c +++ b/src/stasis_indexer.c @@ -272,6 +272,7 @@ int indexer_make_website(struct Delivery *ctx) { strcat(cmd, "--standalone "); strcat(cmd, "-o "); strcat(cmd, fullpath_dest); + strcat(cmd, " "); strcat(cmd, fullpath_src); if (globals.verbose) { puts(cmd); diff --git a/tests/rt_generic.sh b/tests/rt_generic.sh index fced08e..6da953d 100644 --- a/tests/rt_generic.sh +++ b/tests/rt_generic.sh @@ -72,6 +72,7 @@ pushd "$ws" retcode=$? set +x + echo "#### Files ####" find output for cond in "${fail_on_indexer[@]}"; do @@ -80,6 +81,17 @@ pushd "$ws" exit 1 fi done + + echo "#### Contents ####" + files=$(find output -type f \( -name '*.html' \) | sort) + for x in $files; do + echo + echo "FILENAME: $x" + echo + cat "$x" + echo "[EOF]" + echo + done popd rm -rf "$ws" -- cgit