public/kicad-ci
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: pass GITHUB_SHA into the KiBot container

Browse Source 
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.
This commit is contained in:
timmyhadwen
2026-08-23 19:05:36 +10:00
parent b45a79ff29
commit 5c209c7c27
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitea/workflows/kibot.yml
+6 -6
View File
@@ -187,7 +187,7 @@ jobs:
[ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml" [ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml"
cp "$USER_FILE" .gitlab/configs/user.kibot.yaml cp "$USER_FILE" .gitlab/configs/user.kibot.yaml
docker run --rm --volumes-from "$(hostname)" -w "$PWD" \ 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_IMAGE" \
kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \ kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \
-c ".gitlab/configs/sch.kibot.yaml" \ -c ".gitlab/configs/sch.kibot.yaml" \
@@ -221,7 +221,7 @@ jobs:
[ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml" [ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml"
cp "$USER_FILE" .gitlab/configs/user.kibot.yaml cp "$USER_FILE" .gitlab/configs/user.kibot.yaml
docker run --rm --volumes-from "$(hostname)" -w "$PWD" \ 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_IMAGE" \
kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \ kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \
-c ".gitlab/configs/sch.kibot.yaml" \ -c ".gitlab/configs/sch.kibot.yaml" \
@@ -256,7 +256,7 @@ jobs:
[ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml" [ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml"
cp "$USER_FILE" .gitlab/configs/user.kibot.yaml cp "$USER_FILE" .gitlab/configs/user.kibot.yaml
docker run --rm --volumes-from "$(hostname)" -w "$PWD" \ 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_IMAGE" \
kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \ kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \
-c ".gitlab/configs/mech.kibot.yaml" \ -c ".gitlab/configs/mech.kibot.yaml" \
@@ -292,7 +292,7 @@ jobs:
[ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml" [ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml"
cp "$USER_FILE" .gitlab/configs/user.kibot.yaml cp "$USER_FILE" .gitlab/configs/user.kibot.yaml
docker run --rm --volumes-from "$(hostname)" -w "$PWD" \ 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_IMAGE" \
kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \ kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \
-c ".gitlab/configs/pcb_main.kibot.yaml" \ -c ".gitlab/configs/pcb_main.kibot.yaml" \
@@ -326,7 +326,7 @@ jobs:
[ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml" [ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml"
cp "$USER_FILE" .gitlab/configs/user.kibot.yaml cp "$USER_FILE" .gitlab/configs/user.kibot.yaml
docker run --rm --volumes-from "$(hostname)" -w "$PWD" \ 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_IMAGE" \
kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \ kibot -e "${PROJECT_NAME}/${PROJECT_NAME}.kicad_sch" \
-c ".gitlab/configs/pos.kibot.yaml" \ -c ".gitlab/configs/pos.kibot.yaml" \
@@ -364,7 +364,7 @@ jobs:
[ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml" [ -f "${PROJECT_NAME}/kibot.yaml" ] && USER_FILE="${PROJECT_NAME}/kibot.yaml"
cp "$USER_FILE" .gitlab/configs/user.kibot.yaml cp "$USER_FILE" .gitlab/configs/user.kibot.yaml
docker run --rm --volumes-from "$(hostname)" -w "$PWD" \ 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" \ -e WORKDIR="$PWD" \
"$KIBOT_IMAGE" \ "$KIBOT_IMAGE" \
bash -c " bash -c "