From dfd73dad0870e32e5b4652cc6181c1e1fdd09894 Mon Sep 17 00:00:00 2001 From: 0x1d Date: Fri, 7 Nov 2025 08:21:31 +0100 Subject: [PATCH] Fix CI: Generate Ent code and copy to internal/ent The --target flag doesn't work with Ent. Instead, generate code in ent/ directory and then copy it to internal/ent/ where the code expects it. --- .github/workflows/ci.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b61dbec..9cf98c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,9 @@ jobs: make generate-proto if [ -d "ent" ] && [ -f "ent/generate.go" ]; then go install entgo.io/ent/cmd/ent@latest - cd ent && go run -mod=mod entgo.io/ent/cmd/ent generate ./schema --target git.dcentral.systems/toolz/goplt/internal/ent + cd ent && go run -mod=mod entgo.io/ent/cmd/ent generate ./schema + mkdir -p ../internal/ent + cp -r *.go */ ../internal/ent/ 2>/dev/null || true fi - name: Check for test files @@ -106,7 +108,9 @@ jobs: make generate-proto if [ -d "ent" ] && [ -f "ent/generate.go" ]; then go install entgo.io/ent/cmd/ent@latest - cd ent && go run -mod=mod entgo.io/ent/cmd/ent generate ./schema --target git.dcentral.systems/toolz/goplt/internal/ent + cd ent && go run -mod=mod entgo.io/ent/cmd/ent generate ./schema + mkdir -p ../internal/ent + cp -r *.go */ ../internal/ent/ 2>/dev/null || true fi - name: Install golangci-lint @@ -152,7 +156,9 @@ jobs: make generate-proto if [ -d "ent" ] && [ -f "ent/generate.go" ]; then go install entgo.io/ent/cmd/ent@latest - cd ent && go run -mod=mod entgo.io/ent/cmd/ent generate ./schema --target git.dcentral.systems/toolz/goplt/internal/ent + cd ent && go run -mod=mod entgo.io/ent/cmd/ent generate ./schema + mkdir -p ../internal/ent + cp -r *.go */ ../internal/ent/ 2>/dev/null || true fi - name: Build