Skip to content

fix(ci): develop-invariant guard — pure-insertion Dockerfile check, not byte-prefix #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chodeus merged 1 commit into from
Aug 11, 2026
Merged

fix(ci): develop-invariant guard — pure-insertion Dockerfile check, not byte-prefix #505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions .github/workflows/codeql-lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,21 +279,17 @@ jobs:
| grep -Ev '^A[[:space:]]' \
| grep -Ev '^M[[:space:]]+deploy/docker/Dockerfile$' || true)
if [ -n "$bad" ]; then
echo "::error::develop diverges from main beyond added files + an append-only Dockerfile:"
echo "::error::develop diverges from main beyond added files + an insertion-only Dockerfile:"
echo "$bad"
exit 1
fi
# Append-only = main's Dockerfile is an exact byte-PREFIX of develop's; a
# mid-file insertion adds no `-` line, so a diff `^-` check would miss it.
base="$(git merge-base origin/main HEAD)"
base_df="$(mktemp)"
git show "$base:deploy/docker/Dockerfile" > "$base_df"
n=$(wc -c < "$base_df")
if ! head -c "$n" deploy/docker/Dockerfile | cmp -s "$base_df" -; then
echo "::error::deploy/docker/Dockerfile is not append-only vs main (mid-file edit or removal); develop must only append CL2K layers."
# Pure-insertion hunks: no main line removed or edited. CL2K blocks are
# inserted MID-FILE (per build stage), so a byte-prefix check would false-fail.
if git diff origin/main...HEAD -- deploy/docker/Dockerfile | grep -q '^-[^-]'; then
echo "::error::deploy/docker/Dockerfile removes or edits lines present on main; develop may only insert CL2K blocks."
exit 1
fi
echo "OK: develop differs from main only by added files + append-only Dockerfile."
echo "OK: develop differs from main only by added files + an insertion-only Dockerfile."

# ---- Docker Build (gated by all quality checks) ----
docker-validate:
Expand Down