From b64fce6ced2583358c16cfda3e1e84e12e651062 Mon Sep 17 00:00:00 2001 From: copilotcoder Date: Fri, 29 May 2026 19:39:54 -0400 Subject: [PATCH] Trying to get the CICD to flow. Signed-off-by: copilotcoder --- .gitea/workflows/cicd-checks.yaml | 12 ++++++------ .gitea/workflows/cicd-start.yaml | 6 +++--- .gitea/workflows/cicd-tests.yaml | 10 +++++----- .gitea/workflows/cicd.yml | 4 +++- .gitea/workflows/docker-build-base.yaml | 24 ++++++++++++------------ .gitea/workflows/docker-build-main.yaml | 18 +++++++++--------- 6 files changed, 38 insertions(+), 36 deletions(-) diff --git a/.gitea/workflows/cicd-checks.yaml b/.gitea/workflows/cicd-checks.yaml index f1a069e..c705da9 100644 --- a/.gitea/workflows/cicd-checks.yaml +++ b/.gitea/workflows/cicd-checks.yaml @@ -16,7 +16,7 @@ env: GITEA_REGISTRY_HOST: kankali.darkhelm.lan concurrency: - group: checks-${{ github.event.inputs.head_sha || github.sha }} + group: checks-${{ github.sha }} cancel-in-progress: true jobs: @@ -29,8 +29,8 @@ jobs: - name: Audit trigger context env: EVENT_NAME: ${{ github.event_name }} - SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow || 'manual' }} - HEAD_SHA: ${{ github.event.inputs.head_sha || github.sha }} + SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow }} + HEAD_SHA: ${{ github.sha }} REF: ${{ github.ref }} REF_NAME: ${{ github.ref_name }} HEAD_REF: ${{ github.head_ref }} @@ -46,7 +46,7 @@ jobs: - name: Resolve head SHA id: meta env: - HEAD_SHA: ${{ github.event.inputs.head_sha || github.sha }} + HEAD_SHA: ${{ github.sha }} run: | echo "head_sha=${HEAD_SHA}" >> "$GITHUB_OUTPUT" @@ -103,7 +103,7 @@ jobs: if docker image inspect "${IMAGE}" >/dev/null 2>&1; then echo "Using cached CICD image: ${IMAGE}" else - echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login "http://${GITEA_REGISTRY}" -u "${{ secrets.REGISTRY_USER || github.actor }}" --password-stdin + echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login "http://${GITEA_REGISTRY}" -u "${{ github.actor }}" --password-stdin docker pull "${IMAGE}" fi @@ -124,7 +124,7 @@ jobs: steps: - name: Dispatch tests workflow env: - DISPATCH_TOKEN: ${{ secrets.ACTIONS_TRIGGER_TOKEN || secrets.PACKAGE_ACCESS_TOKEN }} + DISPATCH_TOKEN: ${{ secrets.PACKAGE_ACCESS_TOKEN }} HEAD_SHA: ${{ needs.setup.outputs.head_sha }} REPO_FULL: ${{ github.repository }} HEAD_REF: ${{ github.head_ref }} diff --git a/.gitea/workflows/cicd-start.yaml b/.gitea/workflows/cicd-start.yaml index b10610b..ba5c619 100644 --- a/.gitea/workflows/cicd-start.yaml +++ b/.gitea/workflows/cicd-start.yaml @@ -57,13 +57,13 @@ jobs: - name: Registry sanity login env: PACKAGE_ACCESS_TOKEN: ${{ secrets.PACKAGE_ACCESS_TOKEN }} - REGISTRY_USER: ${{ secrets.REGISTRY_USER || github.actor }} + REGISTRY_USER: ${{ github.actor }} run: | echo "${PACKAGE_ACCESS_TOKEN}" | docker login "http://${GITEA_REGISTRY}" -u "${REGISTRY_USER}" --password-stdin - name: Registry sanity push and pull env: - REGISTRY_USER: ${{ secrets.REGISTRY_USER || github.actor }} + REGISTRY_USER: ${{ github.actor }} run: | PREFLIGHT_TAG="${GITHUB_SHA:-manual}" PREFLIGHT_REF="${GITEA_REGISTRY}/darkhelm.org/plex-playlist-ci-preflight:${PREFLIGHT_TAG}" @@ -158,7 +158,7 @@ jobs: - name: Dispatch downstream workflow if: steps.base-decision.outcome == 'success' && steps.base-decision.outputs.head_sha != '' && steps.base-decision.outputs.base_needed != '' env: - DISPATCH_TOKEN: ${{ secrets.ACTIONS_TRIGGER_TOKEN || secrets.PACKAGE_ACCESS_TOKEN }} + DISPATCH_TOKEN: ${{ secrets.PACKAGE_ACCESS_TOKEN }} BASE_NEEDED: ${{ steps.base-decision.outputs.base_needed }} HEAD_SHA: ${{ steps.base-decision.outputs.head_sha }} BASE_HASH: ${{ steps.base-decision.outputs.base_hash }} diff --git a/.gitea/workflows/cicd-tests.yaml b/.gitea/workflows/cicd-tests.yaml index 5978ed4..a6826e9 100644 --- a/.gitea/workflows/cicd-tests.yaml +++ b/.gitea/workflows/cicd-tests.yaml @@ -16,7 +16,7 @@ env: GITEA_REGISTRY_HOST: kankali.darkhelm.lan concurrency: - group: tests-${{ github.event.inputs.head_sha || github.sha }} + group: tests-${{ github.sha }} cancel-in-progress: true jobs: @@ -29,8 +29,8 @@ jobs: - name: Audit trigger context env: EVENT_NAME: ${{ github.event_name }} - SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow || 'manual' }} - HEAD_SHA: ${{ github.event.inputs.head_sha || github.sha }} + SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow }} + HEAD_SHA: ${{ github.sha }} REF: ${{ github.ref }} REF_NAME: ${{ github.ref_name }} HEAD_REF: ${{ github.head_ref }} @@ -46,7 +46,7 @@ jobs: - name: Resolve head SHA id: meta env: - HEAD_SHA: ${{ github.event.inputs.head_sha || github.sha }} + HEAD_SHA: ${{ github.sha }} run: | echo "head_sha=${HEAD_SHA}" >> "$GITHUB_OUTPUT" @@ -71,7 +71,7 @@ jobs: if docker image inspect "${IMAGE}" >/dev/null 2>&1; then echo "Using cached CICD image: ${IMAGE}" else - echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login "http://${GITEA_REGISTRY}" -u "${{ secrets.REGISTRY_USER || github.actor }}" --password-stdin + echo "${{ secrets.PACKAGE_ACCESS_TOKEN }}" | docker login "http://${GITEA_REGISTRY}" -u "${{ github.actor }}" --password-stdin docker pull "${IMAGE}" fi diff --git a/.gitea/workflows/cicd.yml b/.gitea/workflows/cicd.yml index 10379c1..631d0b1 100644 --- a/.gitea/workflows/cicd.yml +++ b/.gitea/workflows/cicd.yml @@ -24,7 +24,7 @@ jobs: - name: Dispatch CICD Start workflow env: - DISPATCH_TOKEN: ${{ secrets.ACTIONS_TRIGGER_TOKEN || secrets.PACKAGE_ACCESS_TOKEN }} + DISPATCH_TOKEN: ${{ secrets.PACKAGE_ACCESS_TOKEN }} REPO_FULL: ${{ github.repository }} HEAD_REF: ${{ github.head_ref }} REF_NAME: ${{ github.ref_name }} @@ -73,3 +73,5 @@ jobs: cat "${RESPONSE_FILE}" || true exit 1 fi + + echo "✓ CICD Start dispatch succeeded" diff --git a/.gitea/workflows/docker-build-base.yaml b/.gitea/workflows/docker-build-base.yaml index bc08f92..8e1c4f3 100644 --- a/.gitea/workflows/docker-build-base.yaml +++ b/.gitea/workflows/docker-build-base.yaml @@ -15,7 +15,7 @@ on: required: false concurrency: - group: base-${{ github.event.inputs.head_sha || github.sha }} + group: base-${{ github.sha }} cancel-in-progress: true env: @@ -35,12 +35,12 @@ jobs: - name: Audit trigger context env: EVENT_NAME: ${{ github.event_name }} - SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow || 'manual' }} - HEAD_SHA: ${{ github.event.inputs.head_sha || github.sha }} + SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow }} + HEAD_SHA: ${{ github.sha }} REF: ${{ github.ref }} REF_NAME: ${{ github.ref_name }} HEAD_REF: ${{ github.head_ref }} - FORCE_REBUILD: ${{ github.event.inputs.force_rebuild || 'false' }} + FORCE_REBUILD: ${{ github.event.inputs.force_rebuild }} run: | echo "=== Dispatch Audit: CICD Base Image ===" echo "event_name=${EVENT_NAME}" @@ -126,8 +126,8 @@ jobs: - name: Verify registry login and minimal push env: PACKAGE_ACCESS_TOKEN: ${{ secrets.PACKAGE_ACCESS_TOKEN }} - REGISTRY_USER: ${{ secrets.REGISTRY_USER || github.actor }} - GITHUB_SHA: ${{ github.event.inputs.head_sha || github.sha }} + REGISTRY_USER: ${{ github.actor }} + GITHUB_SHA: ${{ github.sha }} run: | echo "=== Registry Push Preflight ===" @@ -178,7 +178,7 @@ jobs: - name: Resolve head SHA id: meta env: - HEAD_SHA: ${{ github.event.inputs.head_sha || github.sha }} + HEAD_SHA: ${{ github.sha }} run: | echo "head_sha=${HEAD_SHA}" >> "$GITHUB_OUTPUT" @@ -227,8 +227,8 @@ jobs: id: base-state env: PACKAGE_ACCESS_TOKEN: ${{ secrets.PACKAGE_ACCESS_TOKEN }} - REGISTRY_USER: ${{ secrets.REGISTRY_USER || github.actor }} - FORCE_REBUILD: ${{ github.event.inputs.force_rebuild || 'false' }} + REGISTRY_USER: ${{ github.actor }} + FORCE_REBUILD: ${{ github.event.inputs.force_rebuild }} run: | echo "=== Computing CICD Base Image Hash ===" @@ -288,7 +288,7 @@ jobs: if: steps.base-state.outputs.needs_build == 'true' env: PACKAGE_ACCESS_TOKEN: ${{ secrets.PACKAGE_ACCESS_TOKEN }} - REGISTRY_USER: ${{ secrets.REGISTRY_USER || github.actor }} + REGISTRY_USER: ${{ github.actor }} BASE_HASH: ${{ steps.base-state.outputs.base_hash }} BASE_REF_HASH: ${{ steps.base-state.outputs.base_ref_hash }} BASE_REF_LATEST: ${{ steps.base-state.outputs.base_ref_latest }} @@ -320,7 +320,7 @@ jobs: - name: Verify published base image env: PACKAGE_ACCESS_TOKEN: ${{ secrets.PACKAGE_ACCESS_TOKEN }} - REGISTRY_USER: ${{ secrets.REGISTRY_USER || github.actor }} + REGISTRY_USER: ${{ github.actor }} BASE_REF_HASH: ${{ steps.base-state.outputs.base_ref_hash }} run: | echo "=== Verifying Published CICD Base Image ===" @@ -359,7 +359,7 @@ jobs: steps: - name: Dispatch main build workflow env: - DISPATCH_TOKEN: ${{ secrets.ACTIONS_TRIGGER_TOKEN || secrets.PACKAGE_ACCESS_TOKEN }} + DISPATCH_TOKEN: ${{ secrets.PACKAGE_ACCESS_TOKEN }} HEAD_SHA: ${{ needs.publish-base.outputs.head_sha }} BASE_HASH: ${{ needs.publish-base.outputs.base_hash }} REPO_FULL: ${{ github.repository }} diff --git a/.gitea/workflows/docker-build-main.yaml b/.gitea/workflows/docker-build-main.yaml index 288aff7..1e3ec3f 100644 --- a/.gitea/workflows/docker-build-main.yaml +++ b/.gitea/workflows/docker-build-main.yaml @@ -25,7 +25,7 @@ env: GITEA_REGISTRY_HOST: kankali.darkhelm.lan concurrency: - group: main-build-${{ github.event.inputs.head_sha || github.sha }} + group: main-build-${{ github.sha }} cancel-in-progress: true jobs: @@ -39,10 +39,10 @@ jobs: - name: Audit trigger context env: EVENT_NAME: ${{ github.event_name }} - SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow || 'manual' }} - BASE_NEEDED: ${{ github.event.inputs.base_needed || 'false' }} - HEAD_SHA: ${{ github.event.inputs.head_sha || github.sha }} - BASE_HASH_INPUT: ${{ github.event.inputs.base_hash || '' }} + SOURCE_WORKFLOW: ${{ github.event.inputs.source_workflow }} + BASE_NEEDED: ${{ github.event.inputs.base_needed }} + HEAD_SHA: ${{ github.sha }} + BASE_HASH_INPUT: ${{ github.event.inputs.base_hash }} REF: ${{ github.ref }} REF_NAME: ${{ github.ref_name }} HEAD_REF: ${{ github.head_ref }} @@ -60,7 +60,7 @@ jobs: - name: Resolve head SHA id: meta env: - HEAD_SHA: ${{ github.event.inputs.head_sha || github.sha }} + HEAD_SHA: ${{ github.sha }} run: | echo "head_sha=${HEAD_SHA}" >> "$GITHUB_OUTPUT" @@ -94,10 +94,10 @@ jobs: - name: Build and push complete CICD image env: PACKAGE_ACCESS_TOKEN: ${{ secrets.PACKAGE_ACCESS_TOKEN }} - REGISTRY_USER: ${{ secrets.REGISTRY_USER || github.actor }} + REGISTRY_USER: ${{ github.actor }} SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }} HEAD_SHA: ${{ steps.meta.outputs.head_sha }} - BASE_HASH_INPUT: ${{ github.event.inputs.base_hash || '' }} + BASE_HASH_INPUT: ${{ github.event.inputs.base_hash }} run: | set -e umask 077 @@ -180,7 +180,7 @@ jobs: steps: - name: Dispatch checks workflow env: - DISPATCH_TOKEN: ${{ secrets.ACTIONS_TRIGGER_TOKEN || secrets.PACKAGE_ACCESS_TOKEN }} + DISPATCH_TOKEN: ${{ secrets.PACKAGE_ACCESS_TOKEN }} HEAD_SHA: ${{ needs.build.outputs.head_sha }} REPO_FULL: ${{ github.repository }} HEAD_REF: ${{ github.head_ref }}