diff options
| -rwxr-xr-x | aux/ci/ci-build.sh | 3 | ||||
| -rw-r--r-- | aux/containers/guix/manifest.scm | 1 | ||||
| -rwxr-xr-x | aux/workflow/TODOs.sh | 11 | ||||
| -rwxr-xr-x | aux/workflow/assert-todos.sh | 49 | ||||
| -rwxr-xr-x | aux/workflow/l10n.sh | 1 |
5 files changed, 8 insertions, 57 deletions
diff --git a/aux/ci/ci-build.sh b/aux/ci/ci-build.sh index 34233b7..332d9f0 100755 --- a/aux/ci/ci-build.sh +++ b/aux/ci/ci-build.sh @@ -38,6 +38,9 @@ EOF sh aux/ci/report.sh -n "$PROJECT" -o public rsync -av public/ "/srv/http/$PROJECT/" --delete + 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" } diff --git a/aux/containers/guix/manifest.scm b/aux/containers/guix/manifest.scm index 4f228af..180797b 100644 --- a/aux/containers/guix/manifest.scm +++ b/aux/containers/guix/manifest.scm @@ -8,6 +8,7 @@ sed m4 git + tar gawk make makefile2graph diff --git a/aux/workflow/TODOs.sh b/aux/workflow/TODOs.sh index efc0b04..b7cbae1 100755 --- a/aux/workflow/TODOs.sh +++ b/aux/workflow/TODOs.sh @@ -40,20 +40,13 @@ if [ -z "${PROJECT_UC:-}" ]; then fi -# shellcheck disable=1004 -IDS_REGEX='s:^## \(TODO\|DOING\|WAITING\|MEETING\|INACTIVE\|NEXT\|CANCELLED\|DONE\|WONTFIX\) \(.*\) {#\(.*\)}\(.*\)$:## <a href="#\3"><span class="\1">\1</span> \2</a>\4\ -<pre class="header-anchor" id="\3">#\3</pre>\ -:g' -TAGS_REGEX='s|tag:\([a-z0-9-]*\)|<span class="tag">\1</span>|g' - cat aux/workflow/preamble.md TODOs.md | + td -H | sed \ -e "s:@PROJECT_UC@:$PROJECT_UC:g" \ -e "s:@PROJECT@:$PROJECT:g" \ -e "s:@MAILING_LIST@:$MAILING_LIST:g" \ - -e "s:@TLD@:$TLD:g" \ - -e "$IDS_REGEX" \ - -e "$TAGS_REGEX" | + -e "s:@TLD@:$TLD:g" | pandoc \ --toc \ --highlight-style pygments \ diff --git a/aux/workflow/assert-todos.sh b/aux/workflow/assert-todos.sh index 11db142..f4fd965 100755 --- a/aux/workflow/assert-todos.sh +++ b/aux/workflow/assert-todos.sh @@ -12,51 +12,4 @@ then exit 1 fi -awk -F'{#' ' -BEGIN { - exitstatus = 0 - h2flag = 0 - h2status = "" - prevline = "" - idx = 0 - delete ids[0] -} -h2flag == 1 { - split($0, l, " ") - timelinestatus = l[2] - if (h2status != timelinestatus) { - print "h2/timeline status mismatch for line " NR-1 - print prevline - print $0 - exitstatus = 1 - } - h2status = "" - h2flag = 0 -} - -/^## (TODO|DOING|WAITING|MEETING|INACTIVE|NEXT|CANCELLED|DONE|WONTFIX)/ { - if (match($0, / \{#.*?\}.*$/) == 0) { - print "Missing ID for line " NR ":\n" $0 - exitstatus = 1 - } - id_with_prefix = substr($2, 0, length($2) - 1) - match(id_with_prefix, /^\w+-/) - id = substr(id_with_prefix, RLENGTH + 1) - if (id in arr) { - print "Duplicate ID: " id - exitstatus = 1 - } else { - arr[id] = 1 - } - - split($0, l, " ") - h2status = l[2] - h2flag = 1 - prevline = $0 -} - - -/^# Scratch$/ { - exit exitstatus -} -' TODOs.md +td -L diff --git a/aux/workflow/l10n.sh b/aux/workflow/l10n.sh index cb132a3..f220123 100755 --- a/aux/workflow/l10n.sh +++ b/aux/workflow/l10n.sh @@ -85,6 +85,7 @@ for from_f in "$@"; do parallel_run po_run "$from_f" "$lang" done done +wait EXIT_CODE=0 |