fix(ci): generate Ent from ent/schema and copy to internal/ent

This commit is contained in:
2025-11-07 08:41:03 +01:00
parent 8bb36b5735
commit fb10051443

View File

@@ -43,19 +43,20 @@ jobs:
- name: Generate code - name: Generate code
run: | run: |
make generate-proto make generate-proto
echo "Checking for ent directory..." echo "Checking for Ent schema directory..."
if [ -d "ent" ] && [ -f "ent/generate.go" ]; then if [ -d "ent/schema" ]; then
echo "Generating Ent code..." echo "Generating Ent code..."
go install entgo.io/ent/cmd/ent@latest go install entgo.io/ent/cmd/ent@latest
cd ent && go run -mod=mod entgo.io/ent/cmd/ent generate ./schema cd ent/schema && go run -mod=mod entgo.io/ent/cmd/ent generate .
echo "Copying Ent code to internal/ent..." echo "Copying Ent code to internal/ent..."
mkdir -p ../internal/ent cd .. && mkdir -p ../internal/ent
find . -name "*.go" -type f ! -path "./schema/*" -exec sh -c 'mkdir -p ../internal/ent/$(dirname "{}") && cp "{}" ../internal/ent/"{}"' \; cp -r *.go */ ../internal/ent/ 2>/dev/null || true
rm -f ../internal/ent/generate.go rm -f ../internal/ent/generate.go
rm -rf ../internal/ent/schema
echo "Verifying internal/ent/ent.go exists..." echo "Verifying internal/ent/ent.go exists..."
ls -la ../internal/ent/ent.go || echo "ERROR: ent.go not found!" ls -la ../internal/ent/ent.go || echo "ERROR: ent.go not found!"
else else
echo "WARNING: ent directory or generate.go not found!" echo "WARNING: ent/schema directory not found!"
fi fi
- name: Check for test files - name: Check for test files
@@ -114,19 +115,20 @@ jobs:
- name: Generate code - name: Generate code
run: | run: |
make generate-proto make generate-proto
echo "Checking for ent directory..." echo "Checking for Ent schema directory..."
if [ -d "ent" ] && [ -f "ent/generate.go" ]; then if [ -d "ent/schema" ]; then
echo "Generating Ent code..." echo "Generating Ent code..."
go install entgo.io/ent/cmd/ent@latest go install entgo.io/ent/cmd/ent@latest
cd ent && go run -mod=mod entgo.io/ent/cmd/ent generate ./schema cd ent/schema && go run -mod=mod entgo.io/ent/cmd/ent generate .
echo "Copying Ent code to internal/ent..." echo "Copying Ent code to internal/ent..."
mkdir -p ../internal/ent cd .. && mkdir -p ../internal/ent
find . -name "*.go" -type f ! -path "./schema/*" -exec sh -c 'mkdir -p ../internal/ent/$(dirname "{}") && cp "{}" ../internal/ent/"{}"' \; cp -r *.go */ ../internal/ent/ 2>/dev/null || true
rm -f ../internal/ent/generate.go rm -f ../internal/ent/generate.go
rm -rf ../internal/ent/schema
echo "Verifying internal/ent/ent.go exists..." echo "Verifying internal/ent/ent.go exists..."
ls -la ../internal/ent/ent.go || echo "ERROR: ent.go not found!" ls -la ../internal/ent/ent.go || echo "ERROR: ent.go not found!"
else else
echo "WARNING: ent directory or generate.go not found!" echo "WARNING: ent/schema directory not found!"
fi fi
- name: Install golangci-lint - name: Install golangci-lint
@@ -170,19 +172,20 @@ jobs:
- name: Generate code - name: Generate code
run: | run: |
make generate-proto make generate-proto
echo "Checking for ent directory..." echo "Checking for Ent schema directory..."
if [ -d "ent" ] && [ -f "ent/generate.go" ]; then if [ -d "ent/schema" ]; then
echo "Generating Ent code..." echo "Generating Ent code..."
go install entgo.io/ent/cmd/ent@latest go install entgo.io/ent/cmd/ent@latest
cd ent && go run -mod=mod entgo.io/ent/cmd/ent generate ./schema cd ent/schema && go run -mod=mod entgo.io/ent/cmd/ent generate .
echo "Copying Ent code to internal/ent..." echo "Copying Ent code to internal/ent..."
mkdir -p ../internal/ent cd .. && mkdir -p ../internal/ent
find . -name "*.go" -type f ! -path "./schema/*" -exec sh -c 'mkdir -p ../internal/ent/$(dirname "{}") && cp "{}" ../internal/ent/"{}"' \; cp -r *.go */ ../internal/ent/ 2>/dev/null || true
rm -f ../internal/ent/generate.go rm -f ../internal/ent/generate.go
rm -rf ../internal/ent/schema
echo "Verifying internal/ent/ent.go exists..." echo "Verifying internal/ent/ent.go exists..."
ls -la ../internal/ent/ent.go || echo "ERROR: ent.go not found!" ls -la ../internal/ent/ent.go || echo "ERROR: ent.go not found!"
else else
echo "WARNING: ent directory or generate.go not found!" echo "WARNING: ent/schema directory not found!"
fi fi
- name: Build - name: Build