Unblock CI generate, test, and e2e
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:
16
.github/workflows/make.yaml
vendored
16
.github/workflows/make.yaml
vendored
@@ -80,9 +80,9 @@ jobs:
|
|||||||
- name: "Generate Go code"
|
- name: "Generate Go code"
|
||||||
run: |
|
run: |
|
||||||
go generate ./pkg/server/api/connect/v1
|
go generate ./pkg/server/api/connect/v1
|
||||||
|
go generate ./pkg/server/api/mcp/v1
|
||||||
go generate ./pkg/server/api/console/v1
|
go generate ./pkg/server/api/console/v1
|
||||||
go generate ./pkg/server/api/complianceportal/v1
|
go generate ./pkg/server/api/complianceportal/v1
|
||||||
go generate ./pkg/server/api/mcp/v1
|
|
||||||
- name: "Build binaries"
|
- name: "Build binaries"
|
||||||
env:
|
env:
|
||||||
CGO_ENABLED: "0"
|
CGO_ENABLED: "0"
|
||||||
@@ -253,9 +253,9 @@ jobs:
|
|||||||
- name: "Generate Go code"
|
- name: "Generate Go code"
|
||||||
run: |
|
run: |
|
||||||
go generate ./pkg/server/api/connect/v1
|
go generate ./pkg/server/api/connect/v1
|
||||||
|
go generate ./pkg/server/api/mcp/v1
|
||||||
go generate ./pkg/server/api/console/v1
|
go generate ./pkg/server/api/console/v1
|
||||||
go generate ./pkg/server/api/complianceportal/v1
|
go generate ./pkg/server/api/complianceportal/v1
|
||||||
go generate ./pkg/server/api/mcp/v1
|
|
||||||
- name: "Build probod group binaries"
|
- name: "Build probod group binaries"
|
||||||
env:
|
env:
|
||||||
CGO_ENABLED: "0"
|
CGO_ENABLED: "0"
|
||||||
@@ -318,9 +318,9 @@ jobs:
|
|||||||
- name: "Generate Go code"
|
- name: "Generate Go code"
|
||||||
run: |
|
run: |
|
||||||
go generate ./pkg/server/api/connect/v1
|
go generate ./pkg/server/api/connect/v1
|
||||||
|
go generate ./pkg/server/api/mcp/v1
|
||||||
go generate ./pkg/server/api/console/v1
|
go generate ./pkg/server/api/console/v1
|
||||||
go generate ./pkg/server/api/complianceportal/v1
|
go generate ./pkg/server/api/complianceportal/v1
|
||||||
go generate ./pkg/server/api/mcp/v1
|
|
||||||
- name: "Run gofmt"
|
- name: "Run gofmt"
|
||||||
run: |
|
run: |
|
||||||
output="$(gofmt -l apps cmd packages pkg e2e)"
|
output="$(gofmt -l apps cmd packages pkg e2e)"
|
||||||
@@ -454,12 +454,10 @@ jobs:
|
|||||||
docker compose pull
|
docker compose pull
|
||||||
mkdir -p /tmp/docker-images
|
mkdir -p /tmp/docker-images
|
||||||
docker save $(docker compose config --images) -o /tmp/docker-images/images.tar
|
docker save $(docker compose config --images) -o /tmp/docker-images/images.tar
|
||||||
- name: "Build and start stack in parallel"
|
- name: "Build probod"
|
||||||
run: |
|
run: "make bin/probod"
|
||||||
make stack-up &
|
- name: "Start stack"
|
||||||
STACK_PID=$!
|
run: "make stack-up"
|
||||||
make bin/probod
|
|
||||||
wait $STACK_PID
|
|
||||||
- run: "make stack-ps"
|
- run: "make stack-ps"
|
||||||
- name: "Run e2e tests"
|
- name: "Run e2e tests"
|
||||||
env:
|
env:
|
||||||
|
|||||||
2
.github/workflows/release-probod.yaml
vendored
2
.github/workflows/release-probod.yaml
vendored
@@ -74,9 +74,9 @@ jobs:
|
|||||||
- name: "Generate Go code"
|
- name: "Generate Go code"
|
||||||
run: |
|
run: |
|
||||||
go generate ./pkg/server/api/connect/v1
|
go generate ./pkg/server/api/connect/v1
|
||||||
|
go generate ./pkg/server/api/mcp/v1
|
||||||
go generate ./pkg/server/api/console/v1
|
go generate ./pkg/server/api/console/v1
|
||||||
go generate ./pkg/server/api/complianceportal/v1
|
go generate ./pkg/server/api/complianceportal/v1
|
||||||
go generate ./pkg/server/api/mcp/v1
|
|
||||||
- name: "Build binaries"
|
- name: "Build binaries"
|
||||||
env:
|
env:
|
||||||
CGO_ENABLED: "0"
|
CGO_ENABLED: "0"
|
||||||
|
|||||||
@@ -138,7 +138,7 @@ go-lint: generate
|
|||||||
$(GOLINTCMD) run ./...
|
$(GOLINTCMD) run ./...
|
||||||
|
|
||||||
.PHONY: test
|
.PHONY: test
|
||||||
test: generate
|
test: generate apps/trust/dist/index.html
|
||||||
test: CGO_ENABLED=1
|
test: CGO_ENABLED=1
|
||||||
test: ## Run tests with race detection and coverage (usage: make test [MODULE=./pkg/some/module])
|
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/))
|
$(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
|
$(GO_GENERATE) ./pkg/server/api/console/v1
|
||||||
|
|
||||||
pkg/server/api/complianceportal/v1/schema/schema.go \
|
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
|
$(GO_GENERATE) ./pkg/server/api/complianceportal/v1
|
||||||
|
|
||||||
pkg/server/api/mcp/v1/server/server.go \
|
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
|
$(DOCKER_COMPOSE) exec postgres psql -U probod -d probod
|
||||||
|
|
||||||
compose/step-ca/certs/root_ca.crt:
|
compose/step-ca/certs/root_ca.crt:
|
||||||
# step-ca runs as UID 1000 and must be able to write into the bind mount
|
# step-ca runs as UID 1000 and creates 0700 dirs; open them for the
|
||||||
# on Linux CI (Docker Desktop often masks this locally).
|
# host user so later `go list ./...` can walk the bind mount on Linux.
|
||||||
@$(MKDIR) compose/step-ca
|
@$(MKDIR) compose/step-ca
|
||||||
@chmod a+rwx compose/step-ca
|
@chmod a+rwx compose/step-ca
|
||||||
$(DOCKER_COMPOSE) up -d acme-http-01-proxy 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)); \
|
i=$$((i + 1)); \
|
||||||
done
|
done
|
||||||
@test -f $@ || ($(DOCKER_COMPOSE) logs step-ca >&2; echo "step-ca root CA not ready" >&2; exit 1)
|
@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:
|
compose/keycloak/certs/cert.pem:
|
||||||
$(MKDIR) ./compose/keycloak/certs
|
$(MKDIR) ./compose/keycloak/certs
|
||||||
|
|||||||
@@ -67,8 +67,8 @@ export function CompliancePageDomainsSection(props: {
|
|||||||
|
|
||||||
{customDomain
|
{customDomain
|
||||||
? (
|
? (
|
||||||
<CompliancePageDomainCard fKey={customDomain} />
|
<CompliancePageDomainCard fKey={customDomain} />
|
||||||
)
|
)
|
||||||
: organization.canCreateCustomDomain && (
|
: organization.canCreateCustomDomain && (
|
||||||
<div className="flex flex-col items-center justify-center gap-3 rounded-lg border border-dashed border-border-solid px-4 py-8">
|
<div className="flex flex-col items-center justify-center gap-3 rounded-lg border border-dashed border-border-solid px-4 py-8">
|
||||||
<p className="max-w-md text-center text-sm text-txt-tertiary">
|
<p className="max-w-md text-center text-sm text-txt-tertiary">
|
||||||
|
|||||||
Reference in New Issue
Block a user