Simple conetent + restyled

deploy/build.sh

@@ -7,7 +7,7 @@
 #
 # Two repositories by design: code (templates/CSS, developed by the team) and
 # content (Markdown + uploads, committed by the CMS). The build overlays
-# content onto code, so an editor publishing an article and a developer
+# content onto code, so an editor publishing a page and a developer
 # shipping CSS never mix histories — either change republishes the site.
 set -euo pipefail
 
@@ -17,7 +17,8 @@ BASE="${BASE:-$HOME/ctao-portal-demo}"
 GITEA_URL="${GITEA_URL:-http://localhost:3000}"   # published by ctao-demo-gitea
 CODE_REPO="${CODE_REPO:-ctao/portal}"             # owner/repo in Gitea
 CONTENT_REPO="${CONTENT_REPO:-ctao/content}"
-BRANCH="${BRANCH:-main}"
+CODE_BRANCH="${CODE_BRANCH:-simple}"
+CONTENT_BRANCH="${CONTENT_BRANCH:-simple}"
 BUILD_IMAGE="${BUILD_IMAGE:-localhost/ctao-portal-build:1}"
 # The build joins the Gitea container's network namespace: localhost inside
 # the build = Gitea's loopback (port 3000), host loopback stays unreachable.
@@ -37,16 +38,16 @@ done
 
 # --- 1. Cheap poll: both branch heads via the local Gitea API ---
 head_of() {
-  curl -fsS --max-time 5 "$GITEA_URL/api/v1/repos/$1/branches/$BRANCH" \
+  curl -fsS --max-time 5 "$GITEA_URL/api/v1/repos/$1/branches/$2" \
     | jq -r '.commit.id' || true
 }
-code_sha=$(head_of "$CODE_REPO")
-content_sha=$(head_of "$CONTENT_REPO")
+code_sha=$(head_of "$CODE_REPO" "$CODE_BRANCH")
+content_sha=$(head_of "$CONTENT_REPO" "$CONTENT_BRANCH")
 # Gitea down/unreachable is a transient, not a unit failure — exit 0 quietly
 # instead of painting the journal red every 10 s. Name the repo: a 404 here
 # also means "repo/branch missing or renamed", not just "Gitea down".
-[[ "$code_sha" =~ ^[0-9a-f]{40}$ ]] || { echo "poll failed for $CODE_REPO@$BRANCH (gitea down, or repo/branch missing) — skipping"; exit 0; }
-[[ "$content_sha" =~ ^[0-9a-f]{40}$ ]] || { echo "poll failed for $CONTENT_REPO@$BRANCH (gitea down, or repo/branch missing) — skipping"; exit 0; }
+[[ "$code_sha" =~ ^[0-9a-f]{40}$ ]] || { echo "poll failed for $CODE_REPO@$CODE_BRANCH (gitea down, or repo/branch missing) — skipping"; exit 0; }
+[[ "$content_sha" =~ ^[0-9a-f]{40}$ ]] || { echo "poll failed for $CONTENT_REPO@$CONTENT_BRANCH (gitea down, or repo/branch missing) — skipping"; exit 0; }
 release="${code_sha:0:12}-${content_sha:0:12}"    # code+content pin the release
 # Skip only if this pair is both recorded AND still present in releases/
 # (a deleted release dir must trigger a rebuild, not an eternal skip).
@@ -73,7 +74,7 @@ podman run --rm --network="$BUILD_NETNS" --memory=1g \
   -e ASTRO_TELEMETRY_DISABLED=1 \
   -e CODE_SHA="$code_sha" -e CODE_URL="$CODE_URL" \
   -e CONTENT_SHA="$content_sha" -e CONTENT_URL="$CONTENT_URL" \
-  -e RELEASE="$release" -e BRANCH="$BRANCH" \
+  -e RELEASE="$release" -e CODE_BRANCH="$CODE_BRANCH" -e CONTENT_BRANCH="$CONTENT_BRANCH" \
   -v "$BASE/repo:/work/repo:z" \
   -v "$BASE/content:/work/content:z" \
   -v "$BASE/releases:/work/releases:z" \
@@ -81,21 +82,20 @@ podman run --rm --network="$BUILD_NETNS" --memory=1g \
   -w /work "$BUILD_IMAGE" sh -ec '
     git config --global safe.directory "/work/repo"
     git config --global --add safe.directory "/work/content"
-    sync_clone() {  # $1 dir  $2 url  $3 sha
-      [ -d "$1/.git" ] || git clone --branch "$BRANCH" "$2" "$1"
+    sync_clone() {  # $1 dir  $2 url  $3 sha  $4 branch
+      [ -d "$1/.git" ] || git clone --branch "$4" "$2" "$1"
       git -C "$1" remote set-url origin "$2"   # self-heal if the URL changes
-      git -C "$1" fetch --quiet origin "$BRANCH"
+      git -C "$1" fetch --quiet origin "$4"
       # --force: the working copy is disposable; a stray tracked-file edit
       # must not wedge every future build.
       git -C "$1" checkout --quiet --force "$3"
     }
-    sync_clone repo    "$CODE_URL"    "$CODE_SHA"
-    sync_clone content "$CONTENT_URL" "$CONTENT_SHA"
+    sync_clone repo    "$CODE_URL"    "$CODE_SHA"    "$CODE_BRANCH"
+    sync_clone content "$CONTENT_URL" "$CONTENT_SHA" "$CONTENT_BRANCH"
     # Overlay content onto code (these paths are gitignored in the code repo).
     # mkdir -p: checkout prunes the emptied parent dirs, cp needs them back.
     rm -rf repo/src/content/news repo/src/content/pages repo/public/uploads
     mkdir -p repo/src/content repo/public
-    cp -a content/news    repo/src/content/news
     cp -a content/pages   repo/src/content/pages
     cp -a content/uploads repo/public/uploads
     cd repo
@@ -109,7 +109,9 @@ podman run --rm --network="$BUILD_NETNS" --memory=1g \
       npm ci --ignore-scripts --no-audit --no-fund
       echo "$lock" > .deps-hash
     fi
-    npm run build
+    # Validate the overlay and links before publishing; never seed demo content
+    # in place of an incomplete content branch.
+    npm run check
     rm -rf "../releases/$RELEASE"
     cp -a dist "../releases/$RELEASE"
   ' || { echo "$release" > "$BASE/state/last-failed"; echo "BUILD FAILED for $release (see above) — will not retry until a new commit"; exit 1; }