From 8f6060c5fe07c475cd53c367ab791251168ab460 Mon Sep 17 00:00:00 2001
From: EuAndreh <eu@euandre.org>
Date: Sun, 6 Mar 2022 02:29:37 -0300
Subject: aux/: Update

---
 aux/ci/ci-build.sh | 14 ++++++--------
 aux/ci/report.sh   | 10 +++++++++-
 2 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'aux/ci')

diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh
index 2ec0102..8d18252 100755
--- a/aux/ci/ci-build.sh
+++ b/aux/ci/ci-build.sh
@@ -36,12 +36,10 @@ EOF
 		cd -
 		git fetch origin refs/notes/*:refs/notes/*
 		sh aux/ci/report.sh -n "$PROJECT" -o public
-		rsync -av public/ "/srv/http/$PROJECT/" --delete
+		rsync -av public/ "/srv/http/$PROJECT/"
 
-		if [ -f aux/guix/with-container.sh ]; then
-			cp "$(sh aux/guix/with-container.sh -C)" \
-				"/srv/http/$PROJECT/docker.tar.gz"
-		fi
+		tar -C /srv/http -cf /srv/http/"$PROJECT"/repo.tar.gz \
+			"$PROJECT".git
 
 		printf '\n>>>\n>>> CI logs added as Git note.\n>>>\n>>> Run status was %s\n>>>\n\n' \
 			"$STATUS"
@@ -55,11 +53,11 @@ EOF
 	git config --global user.email git@euandre.org
 	git config --global user.name 'EuAndreh CI'
 
-	if [ -f aux/guix/with-container.sh ]; then
-		RUNNER='sh aux/guix/with-container.sh'
+	if [ -e aux/with-container ]; then
+		RUNNER='sh aux/with-container'
 	else
 		RUNNER='sh -c'
 	fi
 
-	$RUNNER 'make clean public dev-check'
+	$RUNNER 'make clean dev-check'
 } 2>&1 | tee "$LOGFILE"
diff --git a/aux/ci/report.sh b/aux/ci/report.sh
index 6f18f0f..e900e26 100755
--- a/aux/ci/report.sh
+++ b/aux/ci/report.sh
@@ -45,7 +45,8 @@ for c in $(git notes list | cut -d\  -f2); do
 		> "$OUTDIR/ci-logs/$FILENAME"
 done
 
-cat <<EOF >> "$OUT"
+{
+	cat <<EOF
 <!DOCTYPE html>
 <html lang="en">
   <head>
@@ -55,6 +56,12 @@ cat <<EOF >> "$OUT"
     <link rel="icon" type="image/svg+xml" href="favicon.svg" />
     <title>$PROJECT - CI logs</title>
 
+EOF
+
+	cat aux/workflow/style.css
+
+	cat <<EOF
+
     <style>
       pre {
         display: inline;
@@ -72,6 +79,7 @@ cat <<EOF >> "$OUT"
       </h1>
       <ol>
 EOF
+} > "$OUT"
 
 for f in $(find "$OUTDIR/ci-data/" -type f | LANG=C.UTF-8 sort -r); do
 	DATA="$(cat "$f")"
-- 
cgit v1.3