rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Unblock CI generate, test, and e2e

Browse Source 
Generate MCP types before complianceportal, stub apps/trust
dist for embed, fix domains section indent, and start the
compose stack only after bin/probod is built.

Signed-off-by: Bryan Frimin <bryan@probo.com>
This commit is contained in:
Bryan Frimin
2026-07-19 08:46:02 +02:00
parent 17d877a8bd
commit cb1d7c274b
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
GNUmakefile
View File

@@ -138,7 +138,7 @@ go-lint: generate
$(GOLINTCMD) run ./...
.PHONY: test
test: generate
test: generate apps/trust/dist/index.html
test: CGO_ENABLED=1
test: ## Run tests with race detection and coverage (usage: make test [MODULE=./pkg/some/module])
$(GO_TEST) $(if $(MODULE),$(MODULE),$(shell $(GO) list ./... | grep -v /e2e/))
@@ -358,7 +358,7 @@ pkg/server/api/console/v1/types/types.go: pkg/server/api/console/v1/gqlgen.yaml
$(GO_GENERATE) ./pkg/server/api/console/v1
pkg/server/api/complianceportal/v1/schema/schema.go \
pkg/server/api/complianceportal/v1/types/types.go: pkg/server/api/complianceportal/v1/gqlgen.yaml pkg/server/api/complianceportal/v1/graphql $(COMPLIANCEPORTAL_GQL) | pkg/server/api/console/v1/types/types.go apps/compliance-portal/dist/index.html
pkg/server/api/complianceportal/v1/types/types.go: pkg/server/api/complianceportal/v1/gqlgen.yaml pkg/server/api/complianceportal/v1/graphql $(COMPLIANCEPORTAL_GQL) | pkg/server/api/console/v1/types/types.go pkg/server/api/mcp/v1/types/types.go apps/compliance-portal/dist/index.html
$(GO_GENERATE) ./pkg/server/api/complianceportal/v1
pkg/server/api/mcp/v1/server/server.go \
@@ -424,8 +424,8 @@ psql: ## Open a psql shell to the postgres container
$(DOCKER_COMPOSE) exec postgres psql -U probod -d probod
compose/step-ca/certs/root_ca.crt:
# step-ca runs as UID 1000 and must be able to write into the bind mount
# on Linux CI (Docker Desktop often masks this locally).
# step-ca runs as UID 1000 and creates 0700 dirs; open them for the
# host user so later `go list ./...` can walk the bind mount on Linux.
@$(MKDIR) compose/step-ca
@chmod a+rwx compose/step-ca
$(DOCKER_COMPOSE) up -d acme-http-01-proxy step-ca
@@ -435,6 +435,7 @@ compose/step-ca/certs/root_ca.crt:
i=$$((i + 1)); \
done
@test -f $@ || ($(DOCKER_COMPOSE) logs step-ca >&2; echo "step-ca root CA not ready" >&2; exit 1)
@chmod -R a+rX compose/step-ca
compose/keycloak/certs/cert.pem:
$(MKDIR) ./compose/keycloak/certs