From 358aa62c3a25aa453636512f6348f9fae5950856 Mon Sep 17 00:00:00 2001 From: Jon Chery Date: Tue, 11 Aug 2026 19:38:27 +0000 Subject: [PATCH] =?UTF-8?q?fix(P2):=20render=20scripts=20=E2=80=94=20delet?= =?UTF-8?q?e=20render=5Fdeck.sh,=20pin=20versions,=202x=20scale=20(REQ-257?= =?UTF-8?q?,258)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit REQ-257: deleted scripts/render_deck.sh (omitted --theme, produced unthemed output; README already documents render_slides.sh as canonical). Pinned marp-cli@4.5.0 + mermaid-cli@11.16.0 in render_slides.sh to prevent boilerplate-CSS drift. Removed render_deck.sh references from README, sync_to_nova.sh, and test_no_forge_mentions.py. REQ-258: added -s 2 -b transparent to mermaid-cli invocation (matches README spec line 193). Produces crisp 2x PNGs with transparent backgrounds instead of 1x renders. ---ci--- project: acdl phase: 2 milestone: v1.22 status: execute phase_role: execution ---/ci--- --- .ciagent/CHECKPOINT.json | 12 +++---- docs/presentations/README.md | 3 +- scripts/render_deck.sh | 56 --------------------------------- scripts/render_slides.sh | 13 +++++--- scripts/sync_to_nova.sh | 1 - tests/test_no_forge_mentions.py | 2 +- 6 files changed, 16 insertions(+), 71 deletions(-) delete mode 100755 scripts/render_deck.sh diff --git a/.ciagent/CHECKPOINT.json b/.ciagent/CHECKPOINT.json index 6ffb726..8d0947e 100644 --- a/.ciagent/CHECKPOINT.json +++ b/.ciagent/CHECKPOINT.json @@ -1,12 +1,12 @@ { - "phase": 0, + "phase": 1, "stage": "complete", "milestone": "v1.22", - "phase_role": "pre_execution", + "phase_role": "execution", "attempts": 0, - "updated_at": "2026-08-11T14:40:00Z", + "updated_at": "2026-08-11T14:45:00Z", "milestone_complete": false, - "tag": "v1.21.0", - "requirements": ["REQ-254","REQ-255","REQ-256","REQ-257","REQ-258","REQ-259","REQ-260","REQ-261","REQ-262"], - "notes": "v1.22 P0 complete. Tag v1.21.0. Merged phase/00 -> milestone/v1.22-deck-layout-fix. Release creation failed (local-only fallback). Phase branch deleted. Proceeding to P1 (theme CSS)." + "tag": "v1.21.1", + "requirements": ["REQ-254","REQ-255","REQ-256"], + "notes": "v1.22 P1 complete. Tag v1.21.1. Theme CSS fixed (padding, overflow, image, title chrome). 23 slide tests pass. Proceeding to P2 (render scripts)." } \ No newline at end of file diff --git a/docs/presentations/README.md b/docs/presentations/README.md index ca0054c..61c7b7e 100644 --- a/docs/presentations/README.md +++ b/docs/presentations/README.md @@ -84,8 +84,7 @@ CHROME_PATH=/root/.cache/ms-playwright/chromium-1217/chrome-linux64/chrome \ HTML export inlines images as base64 data URIs. PPTX export requires `--allow-local-files` so the local PNG diagrams are embedded in the file. -The render + commit + attach pipeline is automated by `scripts/render_deck.sh` -and `scripts/render_slides.sh`. +The render + commit + attach pipeline is automated by `scripts/render_slides.sh`. ### Step 4 — Talking points (presenter cues) diff --git a/scripts/render_deck.sh b/scripts/render_deck.sh deleted file mode 100755 index b4fc068..0000000 --- a/scripts/render_deck.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env bash -# scripts/render_deck.sh — render a Marp deck to HTML + PPTX, commit both to git. -# REQ-228 (v1.18): PPTX is now a first-class committed artifact + release attachment. -# -# Usage: -# bash scripts/render_deck.sh -# bash scripts/render_deck.sh nova-autonomous-cloud-delivery -# -# Renders: -# docs/presentations/-marp.md → docs/presentations/.html (committed) -# → docs/presentations/.pptx (committed, binary) -# -# The PPTX is also attached to the current phase's Gitea release via -# scripts/attach_release_asset.py (call separately after ship, or this script -# will invoke it if NOVA_GITEA_RELEASE_ID is set). -set -euo pipefail - -DECK="${1:?Usage: render_deck.sh }" -cd "$(git rev-parse --show-toplevel)" - -SRC="docs/presentations/${DECK}-marp.md" -HTML="docs/presentations/${DECK}.html" -PPTX="docs/presentations/${DECK}.pptx" - -if [ ! -f "$SRC" ]; then - echo "ERROR: source deck $SRC not found" >&2; exit 1 -fi - -CHROME="" -for c in \ - /root/.cache/ms-playwright/chromium-1217/chrome-linux64/chrome \ - /usr/bin/chromium \ - /usr/bin/chromium-browser \ - /usr/bin/google-chrome; do - if [ -x "$c" ]; then CHROME="$c"; break; fi -done -if [ -z "$CHROME" ]; then - echo "WARNING: no Chrome/Chromium found — skipping render (HTML/PPTX will need manual re-render)" >&2 - exit 0 -fi -export CHROME_PATH="$CHROME" - -echo "Rendering HTML → $HTML" -npx --yes @marp-team/marp-cli@latest --allow-local-files "$SRC" -o "$HTML" 2>&1 | tail -3 - -echo "Rendering PPTX → $PPTX" -npx --yes @marp-team/marp-cli@latest --allow-local-files "$SRC" -o "$PPTX" 2>&1 | tail -3 - -git add "$HTML" "$PPTX" -echo "Staged $HTML + $PPTX for commit." - -if [ -n "${NOVA_GITEA_RELEASE_ID:-}" ]; then - echo "Attaching PPTX to Gitea release $NOVA_GITEA_RELEASE_ID..." - python3 scripts/attach_release_asset.py "$PPTX" "$NOVA_GITEA_RELEASE_ID" || \ - echo "WARNING: attach failed — PPTX is still committed; attach manually." -fi \ No newline at end of file diff --git a/scripts/render_slides.sh b/scripts/render_slides.sh index 7931f9b..4588c6a 100755 --- a/scripts/render_slides.sh +++ b/scripts/render_slides.sh @@ -41,16 +41,18 @@ if [ -z "$CHROME" ]; then fi export CHROME_PATH="$CHROME" -# --- Step 1: render mermaid diagrams (S&P-themed) --- -echo "=== Step 1: Rendering mermaid diagrams (S&P theme: $THEME_JSON) ===" +# --- Step 1: render mermaid diagrams (S&P-themed, 2x scale, transparent bg) --- +# REQ-258: -s 2 (2x scale) + -b transparent (transparent background) per README spec. +echo "=== Step 1: Rendering mermaid diagrams (S&P theme: $THEME_JSON, 2x, transparent) ===" if [ -d "$MMD_DIR" ]; then for mmd in "$MMD_DIR"/*.mmd; do name="$(basename "$mmd" .mmd)" png="$PNG_DIR/$name.png" echo " $name.mmd → $name.png" - npx --yes @mermaid-js/mermaid-cli \ + npx --yes @mermaid-js/mermaid-cli@11.16.0 \ --configFile "$THEME_JSON" \ --puppeteerConfigFile "$PUPPETEER_CFG" \ + -s 2 -b transparent \ --input "$mmd" \ --output "$png" 2>&1 | grep -v "^$" || true done @@ -61,13 +63,14 @@ fi echo "" # --- Step 2: render Marp deck (S&P-themed) --- +# REQ-257: pinned marp-cli version (v4.5.0) to prevent boilerplate-CSS drift. echo "=== Step 2: Rendering Marp deck → HTML + PPTX ===" echo " Theme: $THEME_CSS" echo " HTML → $HTML" -npx --yes @marp-team/marp-cli@latest --allow-local-files --theme "$THEME_CSS" "$SRC" -o "$HTML" 2>&1 | tail -3 +npx --yes @marp-team/marp-cli@4.5.0 --allow-local-files --theme "$THEME_CSS" "$SRC" -o "$HTML" 2>&1 | tail -3 echo " PPTX → $PPTX" -npx --yes @marp-team/marp-cli@latest --allow-local-files --theme "$THEME_CSS" "$SRC" -o "$PPTX" 2>&1 | tail -3 +npx --yes @marp-team/marp-cli@4.5.0 --allow-local-files --theme "$THEME_CSS" "$SRC" -o "$PPTX" 2>&1 | tail -3 echo "" # --- Step 3: stage --- diff --git a/scripts/sync_to_nova.sh b/scripts/sync_to_nova.sh index c83870e..ebd89e8 100755 --- a/scripts/sync_to_nova.sh +++ b/scripts/sync_to_nova.sh @@ -117,7 +117,6 @@ EXCLUDE_SCRIPTS=( sync_workflows.py attach_release_asset.py check_north_star_diff.sh - render_deck.sh render_slides.sh ) diff --git a/tests/test_no_forge_mentions.py b/tests/test_no_forge_mentions.py index 940bcce..c44c209 100644 --- a/tests/test_no_forge_mentions.py +++ b/tests/test_no_forge_mentions.py @@ -40,7 +40,7 @@ _EXCLUDE_SCRIPTS = { "untag_acdl_keys.py", "seed_uptime_monitors.py", "push_consumer_image.py", "sync_workflows.py", "attach_release_asset.py", "check_north_star_diff.sh", - "render_deck.sh", "render_slides.sh", + "render_slides.sh", } # Synced top-level files (not in any excluded dir).