chore(providers): Docker-based registry-gen make targets for toolchain-less envs #2337

Merged
claude-ceo-assistant merged 1 commits from chore/providers-gen-docker-target into main 2026-06-06 06:19:54 +00:00
2 changed files with 44 additions and 3 deletions
+10 -2
View File
@@ -90,7 +90,13 @@ jobs:
# checked-in artifact; exit 1 (RED) on any drift. This is the
# single source of the gate's verdict — the same code path
# `go test ./cmd/gen-providers` exercises.
go run ./cmd/gen-providers -check
if ! go run ./cmd/gen-providers -check; then
echo "::error::workspace-server/internal/providers/gen/registry_gen.go is stale (drifted from providers.yaml)."
echo "Regenerate and commit it (run from repo root):"
echo " make gen # native (needs a local Go toolchain)"
echo " make gen-docker # Docker only — no local Go needed"
exit 1
fi
- name: Belt-and-braces — regenerate in place and assert clean tree
run: |
@@ -101,7 +107,9 @@ jobs:
go generate ./...
if ! git diff --quiet -- internal/providers/gen/registry_gen.go; then
echo "::error::workspace-server/internal/providers/gen/registry_gen.go drifted from providers.yaml."
echo "Run 'go generate ./...' (or 'go run ./cmd/gen-providers') in workspace-server/ and commit the result."
echo "Regenerate and commit it. No local Go? Use Docker (run from repo root):"
echo " make gen # native (needs a local Go toolchain)"
echo " make gen-docker # Docker only — no local Go needed"
git --no-pager diff -- internal/providers/gen/registry_gen.go | head -80
exit 1
fi
+34 -1
View File
@@ -4,7 +4,27 @@
# use this Makefile; CI calls docker compose / go test directly so the
# Makefile can evolve without breaking the build.
.PHONY: help dev up down logs build test e2e-peer-visibility openapi-spec openapi-spec-check
.PHONY: help dev up down logs build test e2e-peer-visibility openapi-spec openapi-spec-check gen gen-docker gen-check gen-check-docker
# ─── Provider-registry SSOT codegen (internal#718) ─────────────────────
# The Go module lives in workspace-server/. The checked-in artifact
# workspace-server/internal/providers/gen/registry_gen.go is a gofmt'd
# projection of providers.yaml, drift-gated by
# .gitea/workflows/verify-providers-gen.yml. `make gen-docker` runs the SAME
# generator inside the pinned golang image so a toolchain-less env (an agent
# without Go) can regenerate without a local Go install (core#2332 follow-up).
#
# BYTE-EQUIVALENCE: gen-docker is byte-identical to native only while
# GO_VERSION below matches the `go` directive in workspace-server/go.mod.
# NOTE: the CI verify workflow pins setup-go go-version: 'stable' (not '1.25');
# that is a latent hazard — a future Go minor could reformat the artifact in CI
# vs a 1.25 local. Pin CI to '1.25' to close it (tracked alongside this change).
GO_VERSION ?= 1.25
GO_IMAGE ?= golang:$(GO_VERSION)
DOCKER ?= docker
# Mount the Go module (workspace-server) read-write; Go's default -mod=readonly
# keeps go.mod/go.sum untouched — only the artifact is written in-place.
DOCKER_RUN_WS = $(DOCKER) run --rm -v "$(CURDIR)/workspace-server":/src -w /src $(GO_IMAGE)
help: ## Show this help.
@grep -E '^[a-zA-Z0-9_-]+:.*?## ' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-22s\033[0m %s\n", $$1, $$2}'
@@ -56,3 +76,16 @@ openapi-spec: ## Regenerate OpenAPI spec from workspace-server handler annotatio
openapi-spec-check: openapi-spec ## CI gate — fail if openapi-spec produces a diff vs the committed file.
@git diff --exit-code -- workspace-server/docs/openapi/ \
|| (echo "openapi-spec is stale — run 'make openapi-spec' and commit the result" && exit 1)
# ─── Provider-registry codegen targets ────────────────────────────────
gen: ## Regenerate the providers registry artifact natively (needs local Go).
cd workspace-server && go generate ./...
gen-docker: ## Same, inside the pinned $(GO_IMAGE) — Docker only, no local Go.
$(DOCKER_RUN_WS) go generate ./...
gen-check: ## Drift gate (native): exit 1 if the artifact is stale.
cd workspace-server && go run ./cmd/gen-providers -check
gen-check-docker: ## Drift gate inside the pinned $(GO_IMAGE) — Docker only.
$(DOCKER_RUN_WS) go run ./cmd/gen-providers -check