From 2d7e360eac09f023716290b415ff2ba36d0ac637 Mon Sep 17 00:00:00 2001
From: copilotcoder <copilotcoder@darkhelm.org>
Date: Wed, 10 Jun 2026 09:52:02 -0400
Subject: [PATCH] More CICD fixes again again again again again again again
 again again again again again again again again again again again again again
 again again again again again again

Signed-off-by: copilotcoder <copilotcoder@darkhelm.org>
---
 .gitea/workflows/docker-build-base.yaml | 8 ++++++--
 .gitea/workflows/docker-build-main.yaml | 8 ++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.gitea/workflows/docker-build-base.yaml b/.gitea/workflows/docker-build-base.yaml
index 2576883..84417f3 100644
--- a/.gitea/workflows/docker-build-base.yaml
+++ b/.gitea/workflows/docker-build-base.yaml
@@ -41,6 +41,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Emit startup diagnostics
+        shell: sh
         env:
           EVENT_NAME: ${{ github.event_name }}
           SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow }}
@@ -54,7 +55,8 @@ jobs:
           TARGET_LABEL: ubuntu-act-8gb
         run: |
           RESOLVED_HEAD_SHA="${HEAD_SHA_INPUT:-${HEAD_SHA_FALLBACK}}"
-          TRACE_ID="${TRACE_ID_INPUT:-cicd-base-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}-${RESOLVED_HEAD_SHA:0:8}}"
+          TRACE_SUFFIX="$(printf '%s' "${RESOLVED_HEAD_SHA}" | cut -c1-8)"
+          TRACE_ID="${TRACE_ID_INPUT:-cicd-base-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}-${TRACE_SUFFIX}}"
           echo "=== Base Workflow Startup Audit ==="
           echo "event_name=${EVENT_NAME}"
           echo "source_workflow=${SOURCE_WORKFLOW}"
@@ -70,9 +72,11 @@ jobs:
           echo "startup_audit=ok"
 
       - name: Check control-plane reachability
+        shell: sh
         run: |
+          SERVER_URL="${GITHUB_SERVER_URL:-}"
           if command -v curl >/dev/null 2>&1; then
-            if curl -fsS --connect-timeout 5 --max-time 10 "${GITHUB_SERVER_URL%/}/api/v1/version" >/tmp/gitea-version.json 2>/dev/null; then
+            if [ -n "${SERVER_URL}" ] && curl -fsS --connect-timeout 5 --max-time 10 "${SERVER_URL%/}/api/v1/version" >/tmp/gitea-version.json 2>/dev/null; then
               echo "gitea_api_reachable=true"
               cat /tmp/gitea-version.json || true
             else
diff --git a/.gitea/workflows/docker-build-main.yaml b/.gitea/workflows/docker-build-main.yaml
index d32a8e9..c754c5c 100644
--- a/.gitea/workflows/docker-build-main.yaml
+++ b/.gitea/workflows/docker-build-main.yaml
@@ -43,6 +43,7 @@ jobs:
     timeout-minutes: 5
     steps:
       - name: Emit startup diagnostics
+        shell: sh
         env:
           EVENT_NAME: ${{ github.event_name }}
           SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow }}
@@ -57,7 +58,8 @@ jobs:
           TARGET_LABEL: ubuntu-act-8gb
         run: |
           RESOLVED_HEAD_SHA="${HEAD_SHA_INPUT:-${HEAD_SHA_FALLBACK}}"
-          TRACE_ID="${TRACE_ID_INPUT:-cicd-main-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}-${RESOLVED_HEAD_SHA:0:8}}"
+          TRACE_SUFFIX="$(printf '%s' "${RESOLVED_HEAD_SHA}" | cut -c1-8)"
+          TRACE_ID="${TRACE_ID_INPUT:-cicd-main-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}-${TRACE_SUFFIX}}"
           echo "=== Main Workflow Startup Audit ==="
           echo "event_name=${EVENT_NAME}"
           echo "source_workflow=${SOURCE_WORKFLOW}"
@@ -74,9 +76,11 @@ jobs:
           echo "startup_audit=ok"
 
       - name: Check control-plane reachability
+        shell: sh
         run: |
+          SERVER_URL="${GITHUB_SERVER_URL:-}"
           if command -v curl >/dev/null 2>&1; then
-            if curl -fsS --connect-timeout 5 --max-time 10 "${GITHUB_SERVER_URL%/}/api/v1/version" >/tmp/gitea-version.json 2>/dev/null; then
+            if [ -n "${SERVER_URL}" ] && curl -fsS --connect-timeout 5 --max-time 10 "${SERVER_URL%/}/api/v1/version" >/tmp/gitea-version.json 2>/dev/null; then
               echo "gitea_api_reachable=true"
               cat /tmp/gitea-version.json || true
             else