Skip to content

chore(ci): Adds sqlc/mermerd up-to-date checks #2610

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore(ci): Adds sqlc/mermerd up-to-date checks #2610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0f6be8
chore(ci): Adds sqlc/mermerd up-to-date checks
dmihalcik-virtru Aug 1, 2025
c346ac9
Update checks.yaml
dmihalcik-virtru Aug 4, 2025
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
12 changes: 9 additions & 3 deletions .github/workflows/checks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,10 +407,10 @@ jobs:
with:
otdfctl-ref: "main"

buflint:
buflint-and-gencode-checks:
permissions:
contents: read
name: Protocol Buffer Lint and Gencode Up-to-date check
name: Protocol Buffer Lint and All Gencode Up-to-date check
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.4.2
Expand Down Expand Up @@ -442,6 +442,12 @@ jobs:
- run: make proto-generate
- name: generate connect wrappers
run: make connect-wrapper-generate

# Gencode for Database (SQLc) and ERD documentation
- run: cd service && go install github.com/KarnerTh/[email protected]
- run: cd service && go install github.com/sqlc-dev/sqlc/cmd/[email protected]
- run: make policy-erd-gen policy-sql-gen

# Ensure all generated files are staged before checking for diffs
- run: git add docs/openapi/* docs/grpc/* || true
- name: Restore go.mod after installing protoc-gen-doc
Expand All @@ -459,7 +465,7 @@ jobs:
ci:
permissions: {}
needs:
- buflint
- buflint-and-gencode-checks
- go
- image
- integration
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ clean:
for m in $(MODS); do (cd $$m && go clean) || exit 1; done
rm -f opentdf examples/examples

build: proto-generate connect-wrapper-generate opentdf sdk/sdk examples/examples
build: proto-generate policy-sql-gen connect-wrapper-generate opentdf sdk/sdk examples/examples
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The PR description mentions adding up-to-date checks for both sqlc and mermerd. While the sqlc check (policy-sql-gen) is added to the build, the mermerd check (policy-erd-gen) appears to be missing from this target's dependencies.

If this was an oversight, you can add policy-erd-gen here. However, be aware that policy-erd-gen requires a running PostgreSQL database, which might be a consideration for the CI environment.

If adding the mermerd check is out of scope for this PR, please consider updating the PR title and description for clarity.

build: proto-generate policy-sql-gen policy-erd-gen connect-wrapper-generate opentdf sdk/sdk examples/examples


opentdf: $(shell find service)
go build -o opentdf -v service/main.go
Expand Down
Loading