From 79358149cf8736dde70164dbab04d19b182bcdc0 Mon Sep 17 00:00:00 2001 From: copilotcoder Date: Mon, 8 Jun 2026 19:36:20 -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 Signed-off-by: copilotcoder --- .gitea/workflows/cicd-checks.yaml | 15 ++++++++++----- .gitea/workflows/cicd-tests.yaml | 15 ++++++++++----- .gitea/workflows/docker-build-base.yaml | 24 ++++++++++++++++-------- .gitea/workflows/docker-build-main.yaml | 24 ++++++++++++++++-------- .pre-commit-config.yaml | 8 ++++---- 5 files changed, 56 insertions(+), 30 deletions(-) diff --git a/.gitea/workflows/cicd-checks.yaml b/.gitea/workflows/cicd-checks.yaml index 57449d6..d41422e 100644 --- a/.gitea/workflows/cicd-checks.yaml +++ b/.gitea/workflows/cicd-checks.yaml @@ -34,17 +34,20 @@ jobs: env: EVENT_NAME: ${{ github.event_name }} SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow }} - HEAD_SHA: ${{ github.sha }} + HEAD_SHA_INPUT: ${{ github.event.inputs.head_sha }} + HEAD_SHA_FALLBACK: ${{ github.sha }} REF: ${{ github.ref }} REF_NAME: ${{ github.ref_name }} HEAD_REF: ${{ github.head_ref }} TRACE_ID_INPUT: ${{ github.event.inputs.trace_id }} run: | - TRACE_ID="${TRACE_ID_INPUT:-cicd-checks-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}-${HEAD_SHA:0:8}}" + RESOLVED_HEAD_SHA="${HEAD_SHA_INPUT:-${HEAD_SHA_FALLBACK}}" + TRACE_ID="${TRACE_ID_INPUT:-cicd-checks-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}-${RESOLVED_HEAD_SHA:0:8}}" echo "=== Dispatch Audit: CICD Checks ===" echo "event_name=${EVENT_NAME}" echo "source_workflow=${SOURCE_WORKFLOW}" - echo "head_sha=${HEAD_SHA}" + echo "head_sha_input=${HEAD_SHA_INPUT}" + echo "head_sha=${RESOLVED_HEAD_SHA}" echo "ref=${REF}" echo "ref_name=${REF_NAME}" echo "head_ref=${HEAD_REF}" @@ -53,9 +56,11 @@ jobs: - name: Resolve head SHA id: meta env: - HEAD_SHA: ${{ github.sha }} + HEAD_SHA_INPUT: ${{ github.event.inputs.head_sha }} + HEAD_SHA_FALLBACK: ${{ github.sha }} run: | - echo "head_sha=${HEAD_SHA}" >> "$GITHUB_OUTPUT" + RESOLVED_HEAD_SHA="${HEAD_SHA_INPUT:-${HEAD_SHA_FALLBACK}}" + echo "head_sha=${RESOLVED_HEAD_SHA}" >> "$GITHUB_OUTPUT" run-check: name: ${{ matrix.name }} diff --git a/.gitea/workflows/cicd-tests.yaml b/.gitea/workflows/cicd-tests.yaml index 5fe217d..b64b74e 100644 --- a/.gitea/workflows/cicd-tests.yaml +++ b/.gitea/workflows/cicd-tests.yaml @@ -34,17 +34,20 @@ jobs: env: EVENT_NAME: ${{ github.event_name }} SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow }} - HEAD_SHA: ${{ github.sha }} + HEAD_SHA_INPUT: ${{ github.event.inputs.head_sha }} + HEAD_SHA_FALLBACK: ${{ github.sha }} REF: ${{ github.ref }} REF_NAME: ${{ github.ref_name }} HEAD_REF: ${{ github.head_ref }} TRACE_ID_INPUT: ${{ github.event.inputs.trace_id }} run: | - TRACE_ID="${TRACE_ID_INPUT:-cicd-tests-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}-${HEAD_SHA:0:8}}" + RESOLVED_HEAD_SHA="${HEAD_SHA_INPUT:-${HEAD_SHA_FALLBACK}}" + TRACE_ID="${TRACE_ID_INPUT:-cicd-tests-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}-${RESOLVED_HEAD_SHA:0:8}}" echo "=== Dispatch Audit: CICD Tests ===" echo "event_name=${EVENT_NAME}" echo "source_workflow=${SOURCE_WORKFLOW}" - echo "head_sha=${HEAD_SHA}" + echo "head_sha_input=${HEAD_SHA_INPUT}" + echo "head_sha=${RESOLVED_HEAD_SHA}" echo "ref=${REF}" echo "ref_name=${REF_NAME}" echo "head_ref=${HEAD_REF}" @@ -53,9 +56,11 @@ jobs: - name: Resolve head SHA id: meta env: - HEAD_SHA: ${{ github.sha }} + HEAD_SHA_INPUT: ${{ github.event.inputs.head_sha }} + HEAD_SHA_FALLBACK: ${{ github.sha }} run: | - echo "head_sha=${HEAD_SHA}" >> "$GITHUB_OUTPUT" + RESOLVED_HEAD_SHA="${HEAD_SHA_INPUT:-${HEAD_SHA_FALLBACK}}" + echo "head_sha=${RESOLVED_HEAD_SHA}" >> "$GITHUB_OUTPUT" backend-tests: name: Backend Tests diff --git a/.gitea/workflows/docker-build-base.yaml b/.gitea/workflows/docker-build-base.yaml index bb82b6d..2576883 100644 --- a/.gitea/workflows/docker-build-base.yaml +++ b/.gitea/workflows/docker-build-base.yaml @@ -46,18 +46,21 @@ jobs: SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow }} FORCE_REBUILD: ${{ github.event.inputs.force_rebuild }} TRACE_ID_INPUT: ${{ github.event.inputs.trace_id }} - HEAD_SHA: ${{ github.sha }} + HEAD_SHA_INPUT: ${{ github.event.inputs.head_sha }} + HEAD_SHA_FALLBACK: ${{ github.sha }} REF: ${{ github.ref }} REF_NAME: ${{ github.ref_name }} HEAD_REF: ${{ github.head_ref }} TARGET_LABEL: ubuntu-act-8gb run: | - TRACE_ID="${TRACE_ID_INPUT:-cicd-base-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}-${HEAD_SHA:0:8}}" + 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}}" echo "=== Base Workflow Startup Audit ===" echo "event_name=${EVENT_NAME}" echo "source_workflow=${SOURCE_WORKFLOW}" echo "force_rebuild=${FORCE_REBUILD}" - echo "head_sha=${HEAD_SHA}" + echo "head_sha_input=${HEAD_SHA_INPUT}" + echo "head_sha=${RESOLVED_HEAD_SHA}" echo "ref=${REF}" echo "ref_name=${REF_NAME}" echo "head_ref=${HEAD_REF}" @@ -96,17 +99,20 @@ jobs: SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow }} FORCE_REBUILD: ${{ github.event.inputs.force_rebuild }} TRACE_ID_INPUT: ${{ github.event.inputs.trace_id }} - HEAD_SHA: ${{ github.sha }} + HEAD_SHA_INPUT: ${{ github.event.inputs.head_sha }} + HEAD_SHA_FALLBACK: ${{ github.sha }} REF: ${{ github.ref }} REF_NAME: ${{ github.ref_name }} HEAD_REF: ${{ github.head_ref }} run: | - TRACE_ID="${TRACE_ID_INPUT:-cicd-base-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}-${HEAD_SHA:0:8}}" + 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}}" echo "=== Dispatch Audit: CICD Base Image ===" echo "event_name=${EVENT_NAME}" echo "source_workflow=${SOURCE_WORKFLOW}" echo "force_rebuild=${FORCE_REBUILD}" - echo "head_sha=${HEAD_SHA}" + echo "head_sha_input=${HEAD_SHA_INPUT}" + echo "head_sha=${RESOLVED_HEAD_SHA}" echo "ref=${REF}" echo "ref_name=${REF_NAME}" echo "head_ref=${HEAD_REF}" @@ -115,9 +121,11 @@ jobs: - name: Resolve head SHA id: meta env: - HEAD_SHA: ${{ github.sha }} + HEAD_SHA_INPUT: ${{ github.event.inputs.head_sha }} + HEAD_SHA_FALLBACK: ${{ github.sha }} run: | - echo "head_sha=${HEAD_SHA}" >> "$GITHUB_OUTPUT" + RESOLVED_HEAD_SHA="${HEAD_SHA_INPUT:-${HEAD_SHA_FALLBACK}}" + echo "head_sha=${RESOLVED_HEAD_SHA}" >> "$GITHUB_OUTPUT" - name: Minimal checkout for base inputs env: diff --git a/.gitea/workflows/docker-build-main.yaml b/.gitea/workflows/docker-build-main.yaml index 24f35cf..d32a8e9 100644 --- a/.gitea/workflows/docker-build-main.yaml +++ b/.gitea/workflows/docker-build-main.yaml @@ -47,7 +47,8 @@ jobs: EVENT_NAME: ${{ github.event_name }} SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow }} BASE_NEEDED: ${{ github.event.inputs.base_needed }} - HEAD_SHA: ${{ github.sha }} + HEAD_SHA_INPUT: ${{ github.event.inputs.head_sha }} + HEAD_SHA_FALLBACK: ${{ github.sha }} BASE_HASH_INPUT: ${{ github.event.inputs.base_hash }} REF: ${{ github.ref }} REF_NAME: ${{ github.ref_name }} @@ -55,12 +56,14 @@ jobs: TRACE_ID_INPUT: ${{ github.event.inputs.trace_id }} TARGET_LABEL: ubuntu-act-8gb run: | - TRACE_ID="${TRACE_ID_INPUT:-cicd-main-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}-${HEAD_SHA:0:8}}" + 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}}" echo "=== Main Workflow Startup Audit ===" echo "event_name=${EVENT_NAME}" echo "source_workflow=${SOURCE_WORKFLOW}" echo "base_needed=${BASE_NEEDED}" - echo "head_sha=${HEAD_SHA}" + echo "head_sha_input=${HEAD_SHA_INPUT}" + echo "head_sha=${RESOLVED_HEAD_SHA}" echo "base_hash_input=${BASE_HASH_INPUT}" echo "ref=${REF}" echo "ref_name=${REF_NAME}" @@ -98,19 +101,22 @@ jobs: EVENT_NAME: ${{ github.event_name }} SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow }} BASE_NEEDED: ${{ github.event.inputs.base_needed }} - HEAD_SHA: ${{ github.sha }} + HEAD_SHA_INPUT: ${{ github.event.inputs.head_sha }} + HEAD_SHA_FALLBACK: ${{ github.sha }} BASE_HASH_INPUT: ${{ github.event.inputs.base_hash }} REF: ${{ github.ref }} REF_NAME: ${{ github.ref_name }} HEAD_REF: ${{ github.head_ref }} TRACE_ID_INPUT: ${{ github.event.inputs.trace_id }} run: | - TRACE_ID="${TRACE_ID_INPUT:-cicd-main-${GITHUB_RUN_ID}-${GITHUB_RUN_ATTEMPT}-${HEAD_SHA:0:8}}" + 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}}" echo "=== Dispatch Audit: CICD Main Build ===" echo "event_name=${EVENT_NAME}" echo "source_workflow=${SOURCE_WORKFLOW}" echo "base_needed=${BASE_NEEDED}" - echo "head_sha=${HEAD_SHA}" + echo "head_sha_input=${HEAD_SHA_INPUT}" + echo "head_sha=${RESOLVED_HEAD_SHA}" echo "base_hash_input=${BASE_HASH_INPUT}" echo "ref=${REF}" echo "ref_name=${REF_NAME}" @@ -120,9 +126,11 @@ jobs: - name: Resolve head SHA id: meta env: - HEAD_SHA: ${{ github.sha }} + HEAD_SHA_INPUT: ${{ github.event.inputs.head_sha }} + HEAD_SHA_FALLBACK: ${{ github.sha }} run: | - echo "head_sha=${HEAD_SHA}" >> "$GITHUB_OUTPUT" + RESOLVED_HEAD_SHA="${HEAD_SHA_INPUT:-${HEAD_SHA_FALLBACK}}" + echo "head_sha=${RESOLVED_HEAD_SHA}" >> "$GITHUB_OUTPUT" - name: Minimal checkout for build inputs env: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ab35359..900a28c 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -78,7 +78,7 @@ repos: # ESLint with auto-fix for pre-commit (CI uses --no-fix) - id: eslint name: eslint - entry: bash -c 'export PATH="$HOME/.local/share/mise/shims:$HOME/.local/bin:$PATH" && cd frontend && corepack yarn eslint . --fix' + entry: bash -c 'export PATH="$HOME/.local/share/mise/shims:$HOME/.local/bin:$PATH" && cd frontend && if command -v yarn >/dev/null 2>&1; then yarn eslint . --fix; else corepack yarn eslint . --fix; fi' language: system files: ^frontend/.*\.(js|ts|vue)$ pass_filenames: false @@ -86,7 +86,7 @@ repos: # Prettier with auto-format for pre-commit (CI uses --check) - id: prettier name: prettier - entry: bash -c 'export PATH="$HOME/.local/share/mise/shims:$HOME/.local/bin:$PATH" && cd frontend && corepack yarn prettier --write src/' + entry: bash -c 'export PATH="$HOME/.local/share/mise/shims:$HOME/.local/bin:$PATH" && cd frontend && if command -v yarn >/dev/null 2>&1; then yarn prettier --write src/; else corepack yarn prettier --write src/; fi' language: system files: ^frontend/.*\.(js|ts|vue|json|css|scss|md)$ pass_filenames: false @@ -94,7 +94,7 @@ repos: # TypeScript type checking (same as CI) - id: typescript-check name: typescript-check - entry: bash -c 'export PATH="$HOME/.local/share/mise/shims:$HOME/.local/bin:$PATH" && cd frontend && corepack yarn vue-tsc --noEmit' + entry: bash -c 'export PATH="$HOME/.local/share/mise/shims:$HOME/.local/bin:$PATH" && cd frontend && if command -v yarn >/dev/null 2>&1; then yarn vue-tsc --noEmit; else corepack yarn vue-tsc --noEmit; fi' language: system files: ^frontend/.*\.(ts|vue)$ pass_filenames: false @@ -102,7 +102,7 @@ repos: # TSDoc linting with auto-fix for pre-commit (CI uses --no-fix) - id: tsdoc-lint name: tsdoc-lint - entry: bash -c 'export PATH="$HOME/.local/share/mise/shims:$HOME/.local/bin:$PATH" && cd frontend && corepack yarn eslint . --ext .ts,.vue --fix' + entry: bash -c 'export PATH="$HOME/.local/share/mise/shims:$HOME/.local/bin:$PATH" && cd frontend && if command -v yarn >/dev/null 2>&1; then yarn eslint . --ext .ts,.vue --fix; else corepack yarn eslint . --ext .ts,.vue --fix; fi' language: system files: ^frontend/.*\.(ts|vue)$ pass_filenames: false