diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index f41239c38..4bdf01e02 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -17,8 +17,16 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Github Code - uses: actions/checkout@v2 - + uses: actions/checkout@v3 + - name: update dependencies + run: make gftidy + - name: Commit & Push changes + uses: actions-js/push@master + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + author_name: TagRobot + author_email: tagrobot@goframe.org + message: "update version to ${{ github.ref_name }}" - name: Auto Creating Tags run: | git config --global user.email "tagrobot@goframe.org" diff --git a/Makefile b/Makefile index 2bc823ed4..0a2a9441c 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ - +SHELL := /bin/bash .PHONY: tidy tidy: @@ -18,16 +18,22 @@ lint: gftidy: $(eval files=$(shell find . -name go.mod)) @set -e; \ + # GITHUB_REF_NAME=v2.4.0; \ + if [[ $$GITHUB_REF_NAME =~ "v" ]]; then \ + latestVersion=$$GITHUB_REF_NAME; \ + else \ + latestVersion=latest; \ + fi; \ for file in ${files}; do \ goModPath=$$(dirname $$file); \ - echo "Processing dir: $$goModPath"; \ - if [[ $$goModPath =~ ".git" || $$goModPath == "." ]] ; then \ - echo "Skip path"; \ - elif [[ $$goModPath =~ "./cmd/gf" || $$goModPath =~ "./example" ]] ; then \ - echo "Skip path"; \ - else \ + if [[ $$goModPath =~ "./contrib" || $$goModPath =~ "./cmd/gf" || $$goModPath =~ "./example" ]]; then \ + echo ""; \ + echo "processing dir: $$goModPath"; \ + # Do not modify the order of any of the following sentences \ cd $$goModPath; \ - go get -u -v github.com/gogf/gf/v2; \ + go mod tidy; \ + go list -f "{{if and (not .Indirect) (not .Main)}}{{.Path}}@$$latestVersion{{end}}" -m all | grep "^github.com/gogf/gf/contrib" | xargs -L1 go get -v; \ + go get -v github.com/gogf/gf/v2@$$latestVersion; \ go mod tidy; \ cd -; \ fi \ diff --git a/example/go.mod b/example/go.mod index 379bb9b20..ffde3ffbe 100644 --- a/example/go.mod +++ b/example/go.mod @@ -25,6 +25,7 @@ require ( replace ( github.com/gogf/gf/contrib/config/apollo/v2 => ../contrib/config/apollo/ github.com/gogf/gf/contrib/config/kubecm/v2 => ../contrib/config/kubecm/ + github.com/gogf/gf/contrib/config/nacos/v2 => ../contrib/config/nacos/ github.com/gogf/gf/contrib/config/polaris/v2 => ../contrib/config/polaris/ github.com/gogf/gf/contrib/drivers/mysql/v2 => ../contrib/drivers/mysql/ github.com/gogf/gf/contrib/nosql/redis/v2 => ../contrib/nosql/redis/ diff --git a/example/go.sum b/example/go.sum index 0cd1b9a58..07f96187c 100644 --- a/example/go.sum +++ b/example/go.sum @@ -188,8 +188,6 @@ github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LB github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gogf/gf/contrib/config/nacos/v2 v2.3.3 h1:eGXzJ4pOdkqIJlJoe2PP3KShxcFYeF+WUC5ABLVu39k= -github.com/gogf/gf/contrib/config/nacos/v2 v2.3.3/go.mod h1:phuuQsfTgyMdEENfotnk22ZrEu48pO7rjho158bZsD0= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=