From 5c209c7c27f6bcfd2c128bc89b00a5f90f041a4d Mon Sep 17 00:00:00 2001 From: timmyhadwen Date: Sun, 23 Aug 2026 19:05:36 +1000 Subject: [PATCH] ci: pass GITHUB_SHA into the KiBot container The configs' rev fallback now uses GITHUB_SHA in place of GitLab's CI_COMMIT_SHORT_SHA, so the variable has to reach the container for that fallback to resolve to anything. --- .gitea/workflows/kibot.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/kibot.yml b/.gitea/workflows/kibot.yml index ed86990..3e97e1b 100644 --- a/.gitea/workflows/kibot.yml +++ b/.gitea/workflows/kibot.yml @@ -187,7 +187,7 @@ jobs: [ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml" cp "$USER_FILE" .gitlab/configs/user.kibot.yaml docker run --rm --volumes-from "$(hostname)" -w "$PWD" \ - -e KIBOT_VAR_name -e KIBOT_VAR_rev -e KIBOT_VAR_rev_pcb \ + -e KIBOT_VAR_name -e KIBOT_VAR_rev -e KIBOT_VAR_rev_pcb -e GITHUB_SHA \ "$KIBOT_IMAGE" \ kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \ -c ".gitlab/configs/sch.kibot.yaml" \ @@ -221,7 +221,7 @@ jobs: [ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml" cp "$USER_FILE" .gitlab/configs/user.kibot.yaml docker run --rm --volumes-from "$(hostname)" -w "$PWD" \ - -e KIBOT_VAR_name -e KIBOT_VAR_rev -e KIBOT_VAR_rev_pcb \ + -e KIBOT_VAR_name -e KIBOT_VAR_rev -e KIBOT_VAR_rev_pcb -e GITHUB_SHA \ "$KIBOT_IMAGE" \ kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \ -c ".gitlab/configs/sch.kibot.yaml" \ @@ -256,7 +256,7 @@ jobs: [ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml" cp "$USER_FILE" .gitlab/configs/user.kibot.yaml docker run --rm --volumes-from "$(hostname)" -w "$PWD" \ - -e KIBOT_VAR_name -e KIBOT_VAR_rev -e KIBOT_VAR_rev_pcb \ + -e KIBOT_VAR_name -e KIBOT_VAR_rev -e KIBOT_VAR_rev_pcb -e GITHUB_SHA \ "$KIBOT_IMAGE" \ kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \ -c ".gitlab/configs/mech.kibot.yaml" \ @@ -292,7 +292,7 @@ jobs: [ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml" cp "$USER_FILE" .gitlab/configs/user.kibot.yaml docker run --rm --volumes-from "$(hostname)" -w "$PWD" \ - -e KIBOT_VAR_name -e KIBOT_VAR_rev -e KIBOT_VAR_rev_pcb \ + -e KIBOT_VAR_name -e KIBOT_VAR_rev -e KIBOT_VAR_rev_pcb -e GITHUB_SHA \ "$KIBOT_IMAGE" \ kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \ -c ".gitlab/configs/pcb_main.kibot.yaml" \ @@ -326,7 +326,7 @@ jobs: [ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml" cp "$USER_FILE" .gitlab/configs/user.kibot.yaml docker run --rm --volumes-from "$(hostname)" -w "$PWD" \ - -e KIBOT_VAR_name -e KIBOT_VAR_rev -e KIBOT_VAR_rev_pcb \ + -e KIBOT_VAR_name -e KIBOT_VAR_rev -e KIBOT_VAR_rev_pcb -e GITHUB_SHA \ "$KIBOT_IMAGE" \ kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \ -c ".gitlab/configs/pos.kibot.yaml" \ @@ -364,7 +364,7 @@ jobs: [ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml" cp "$USER_FILE" .gitlab/configs/user.kibot.yaml docker run --rm --volumes-from "$(hostname)" -w "$PWD" \ - -e KIBOT_VAR_name -e KIBOT_VAR_rev -e KIBOT_VAR_rev_pcb \ + -e KIBOT_VAR_name -e KIBOT_VAR_rev -e KIBOT_VAR_rev_pcb -e GITHUB_SHA \ -e WORKDIR="$PWD" \ "$KIBOT_IMAGE" \ bash -c "