From fe8f72e70739b7a55330a2a609fe3fd2a0bfc1ae Mon Sep 17 00:00:00 2001
From: galargh <piotr.galar@gmail.com>
Date: Tue, 28 Feb 2023 13:00:23 +0100
Subject: [PATCH] ci: replace junit html generation with gh action

---
 .github/workflows/sharness.yml                | 18 +++++++--
 test/sharness/Rules.mk                        | 15 -------
 test/sharness/lib/download-saxon.sh           | 39 -------------------
 test/sharness/lib/test-generate-junit-html.sh | 20 ----------
 4 files changed, 15 insertions(+), 77 deletions(-)
 delete mode 100755 test/sharness/lib/download-saxon.sh
 delete mode 100755 test/sharness/lib/test-generate-junit-html.sh

diff --git a/.github/workflows/sharness.yml b/.github/workflows/sharness.yml
index 44df1e8a0..8809f2a53 100644
--- a/.github/workflows/sharness.yml
+++ b/.github/workflows/sharness.yml
@@ -56,9 +56,7 @@ jobs:
           make -O -j "$PARALLEL" \
             test_sharness \
             coverage/sharness_tests.coverprofile \
-            test/sharness/test-results/sharness.xml \
-            test/sharness/test-results/sharness.html \
-            test/sharness/test-results/sharness-html
+            test/sharness/test-results/sharness.xml
         working-directory: kubo
         env:
           TEST_NO_DOCKER: 0
@@ -88,6 +86,13 @@ jobs:
           echo "# Summary" >> $GITHUB_STEP_SUMMARY
           echo >> $GITHUB_STEP_SUMMARY
           cat kubo/test/sharness/test-results/summary.txt >> $GITHUB_STEP_SUMMARY
+      - name: Generate one-page HTML report
+        uses: pl-strflt/junit-xml-to-html@v1
+        if: failure() || success()
+        with:
+          mode: no-frames
+          input: kubo/test/sharness/test-results/sharness.xml
+          output: kubo/test/sharness/test-results/sharness.html
       - name: Upload one-page HTML report to S3
         id: one-page
         uses: pl-strflt/tf-aws-gh-runner/.github/actions/upload-artifact@main
@@ -101,6 +106,13 @@ jobs:
         with:
           name: sharness.html
           path: kubo/test/sharness/test-results/sharness.html
+      - name: Generate full HTML report
+        uses: pl-strflt/junit-xml-to-html@v1
+        if: failure() || success()
+        with:
+          mode: frames
+          input: kubo/test/sharness/test-results/sharness.xml
+          output: kubo/test/sharness/test-results/sharness-html
       - name: Upload full HTML report to S3
         id: full
         uses: pl-strflt/tf-aws-gh-runner/.github/actions/upload-artifact@main
diff --git a/test/sharness/Rules.mk b/test/sharness/Rules.mk
index 20b2634db..f95aee15e 100644
--- a/test/sharness/Rules.mk
+++ b/test/sharness/Rules.mk
@@ -47,21 +47,6 @@ $(d)/test-results/sharness.xml: $(T_$(d))
 	@(cd $(@D)/.. && ./lib/test-aggregate-junit-reports.sh)
 .PHONY: $(d)/test-results/sharness.xml
 
-$(d)/download-saxon:
-	@echo "*** $@ ***"
-	@(cd $(@D) && ./lib/download-saxon.sh)
-.PHONY: $(d)/download-saxon
-
-$(d)/test-results/sharness-html: $(d)/test-results/sharness.xml $(d)/download-saxon
-	@echo "*** $@ ***"
-	@(cd $(@D)/.. && ./lib/test-generate-junit-html.sh frames)
-.PHONY: $(d)/test-results/sharness-html
-
-$(d)/test-results/sharness.html: $(d)/test-results/sharness.xml $(d)/download-saxon
-	@echo "*** $@ ***"
-	@(cd $(@D)/.. && ./lib/test-generate-junit-html.sh no-frames)
-.PHONY: $(d)/test-results/sharness.html
-
 $(d)/clean-test-results:
 	rm -rf $(@D)/test-results
 .PHONY: $(d)/clean-test-results
diff --git a/test/sharness/lib/download-saxon.sh b/test/sharness/lib/download-saxon.sh
deleted file mode 100755
index cc645238f..000000000
--- a/test/sharness/lib/download-saxon.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-dependencies=(
-  "url=https://raw.githubusercontent.com/pl-strflt/Saxon-HE/3e039cdbccf4efb9643736f34c839a3bae3402ae/11/Java/SaxonHE11-4J.zip;md5=8a4783d307c32c898f8995b8f337fd6b"
-  "url=https://raw.githubusercontent.com/pl-strflt/ant/c781f7d79b92cc55530245d9554682a47f46851e/src/etc/junit-frames-saxon.xsl;md5=6eb013566903a91e4959413f6ff144d0"
-  "url=https://raw.githubusercontent.com/pl-strflt/ant/c781f7d79b92cc55530245d9554682a47f46851e/src/etc/junit-noframes-saxon.xsl;md5=8d54882d5f9d32a7743ec675cc2e30ac"
-)
-
-dependenciesdir="lib/dependencies"
-mkdir -p "$dependenciesdir"
-
-get_md5() {
-  md5sum "$1" | cut -d ' ' -f 1
-}
-
-for dependency in "${dependencies[@]}"; do
-  url="$(echo "$dependency" | cut -d ';' -f 1 | cut -d '=' -f 2)"
-  md5="$(echo "$dependency" | cut -d ';' -f 2 | cut -d '=' -f 2)"
-  filename="$(basename "$url")"
-  if test -f "$dependenciesdir/$filename" && test "$(get_md5 "$dependenciesdir/$filename")" = "$md5"; then
-    echo "Using cached $filename"
-  else
-    echo "Downloading $filename"
-    curl -L --max-redirs 5 --retry 5 --no-progress-meter --output "$dependenciesdir/$filename" "$url"
-    actual_md5="$(get_md5 "$dependenciesdir/$filename")"
-    if test "$actual_md5" != "$md5"; then
-      echo "Downloaded $filename has wrong md5sum ('$actual_md5' != '$md5')"
-      exit 1
-    fi
-    dirname=${filename%.*}
-    extension=${filename#$dirname.}
-    if test "$extension" = "zip"; then
-      echo "Removing old $dependenciesdir/$dirname"
-      rm -rf "$dependenciesdir/$dirname"
-      echo "Unzipping $dependenciesdir/$filename"
-      unzip "$dependenciesdir/$filename" -d "$dependenciesdir/$dirname"
-    fi
-  fi
-done
diff --git a/test/sharness/lib/test-generate-junit-html.sh b/test/sharness/lib/test-generate-junit-html.sh
deleted file mode 100755
index 2790a7b9d..000000000
--- a/test/sharness/lib/test-generate-junit-html.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-case "$1" in
-  "frames")
-    java -jar lib/dependencies/SaxonHE11-4J/saxon-he-11.4.jar \
-      -s:test-results/sharness.xml \
-      -xsl:lib/dependencies/junit-frames-saxon.xsl \
-      output.dir=$(pwd)/test-results/sharness-html
-    ;;
-  "no-frames")
-    java -jar lib/dependencies/SaxonHE11-4J/saxon-he-11.4.jar \
-      -s:test-results/sharness.xml \
-      -xsl:lib/dependencies/junit-noframes-saxon.xsl \
-      -o:test-results/sharness.html
-    ;;
-  *)
-    echo "Usage: $0 [frames|no-frames]"
-    exit 1
-    ;;
-esac