Merge pull request #444 from hello-wn/master

feat: update ent to latest version
shanbay · Apr 24, 2023 · 580250e · 580250e
2 parents 1a79a4b + 768f794
commit 580250e
Show file tree

Hide file tree

Showing 44 changed files with 3,222 additions and 1,257 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -11,7 +11,7 @@ updates:
     versions:
     - 1.36.0
     - 1.36.1
-  - dependency-name: github.com/facebook/ent
+  - dependency-name: entgo.io/ent
     versions:
     - 0.5.4
     - 0.6.0

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: "${{ matrix.os }}"
     strategy:
       matrix:
-        go-version: ['1.15', '1.16', '1.17', '1.18']
+        go-version: ['1.18', '1.19']
         os: [ubuntu-latest]
 
     services:

diff --git a/cmd/gobay/README.md b/cmd/gobay/README.md
@@ -12,7 +12,7 @@ gobay new github.com/shanbay/my_proj
 - openapi 工具: [oapi-codegen](https://github.com/shanbay/oapi-codegen/releases)
 - grpc/protobuf 工具: [grpc-go](https://github.com/grpc/grpc-go) [protobuf](https://github.com/golang/protobuf)
 - lint 工具: [golangci-lint](https://github.com/golangci/golangci-lint#binary)
-- orm 代码生成(ent): [ent](https://github.com/shanbay/ent) 请安装这个版本的 entc `go get github.com/facebook/ent/cmd/entc@v0.4.0`
+- orm 代码生成(ent): [ent](https://github.com/shanbay/ent) 请安装这个版本的 entc `go install entgo.io/ent/cmd/ent@latest`
 - gocovmerge: [gocovmerge](https://github.com/wadey/gocovmerge)
 - pre-commit: [pre-commit](https://pre-commit.com/#installation)
 - gotests: [gotests](https://github.com/cweill/gotests)

diff --git a/cmd/gobay/templates/Makefile.tmpl b/cmd/gobay/templates/Makefile.tmpl
@@ -300,10 +300,10 @@ $(EMPTY_SCHEMA_PATH): $(DIR_SCHEMA_GEN)
 	echo "package entschema" > $(EMPTY_SCHEMA_PATH)
 
 entinit:
-	entc init --target $(DIR_SCHEMA) $(ARGS)
+	ent init --target $(DIR_SCHEMA) $(ARGS)
 
 entgen: $(EMPTY_SCHEMA_PATH)
-	entc generate --target $(DIR_SCHEMA_GEN) --template $(DIR_SCHEMA_TMPL) $(DIR_SCHEMA)
+	ent generate --target $(DIR_SCHEMA_GEN) --template $(DIR_SCHEMA_TMPL) $(DIR_SCHEMA)
 
 entdesc:
-	entc describe $(DIR_SCHEMA)
+	ent describe $(DIR_SCHEMA)
diff --git a/cmd/gobay/templates/app/extensions.go.tmpl b/cmd/gobay/templates/app/extensions.go.tmpl
@@ -3,7 +3,7 @@ package app
 import (
 	// "context"
 	// schema "{{ $.Url }}/gen/entschema"
-	// "github.com/facebook/ent/dialect"
+	// "entgo.io/ent/dialect"
 	// "github.com/go-redis/redis"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/shanbay/gobay"

diff --git a/cmd/gobay/templates/dockerfiles/Dockerfile-dev b/cmd/gobay/templates/dockerfiles/Dockerfile-dev
@@ -24,7 +24,7 @@ ENV GO111MODULE=on
 RUN go get github.com/shanbay/gobay/cmd/gobay
 
 # ent orm
-RUN go get github.com/facebook/ent/cmd/entc@v0.4.0
+RUN go install entgo.io/ent/cmd/ent@latest
 
 # grpc
 RUN apt-get install protobuf-compiler -y

diff --git a/cmd/gobay/templates/go.mod.tmpl b/cmd/gobay/templates/go.mod.tmpl
@@ -1,10 +1,10 @@
 module {{ $.Url }}
 
-go 1.14
+go 1.18
 
 require (
-	github.com/facebook/ent v0.4.3
+	entgo.io/ent v0.11.7
 	github.com/deepmap/oapi-codegen v1.8.2
 )
 
-replace github.com/facebook/ent => github.com/shanbay/ent v0.4.3
+replace entgo.io/ent => github.com/shanbay/ent v0.11.7