diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9276589..1151730 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,6 +44,12 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 + - name: Get Casbin version from go.mod + id: go-mod-version + run: | + version=$(go list -m -json github.com/casbin/casbin/v2 | jq -r .Version) + echo "version=$version" >> $GITHUB_OUTPUT + - name: Run GoReleaser uses: goreleaser/goreleaser-action@v6 with: @@ -52,3 +58,4 @@ jobs: args: release --clean env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CASBIN_VERSION: ${{ steps.go-mod-version.outputs.version }} diff --git a/.goreleaser.yaml b/.goreleaser.yaml index 3d8a0f3..3a5136e 100644 --- a/.goreleaser.yaml +++ b/.goreleaser.yaml @@ -22,6 +22,15 @@ builds: - linux - windows - darwin + goarch: + - amd64 + - arm64 + ldflags: + - -s -w -X {{ .ModulePath }}/cmd.Version={{.Version}} + - -X {{ .ModulePath }}/cmd.BuildTime={{.Date}} + - -X {{ .ModulePath }}/cmd.GitHash={{.FullCommit}} + - -X {{ .ModulePath }}/cmd.GitTag={{.Tag}} + - -X {{ .ModulePath }}/cmd.CasbinVersion={{.Env.CASBIN_VERSION}} archives: - format: tar.gz @@ -42,5 +51,7 @@ changelog: sort: asc filters: exclude: - - "^docs:" - - "^test:" + - '^docs:' + - '^test:' + - '^ci:' + - '^chore:' diff --git a/.releaserc.json b/.releaserc.json index 58cb0bb..e8775ac 100644 --- a/.releaserc.json +++ b/.releaserc.json @@ -3,6 +3,7 @@ "branches": [ "+([0-9])?(.{+([0-9]),x}).x", "master", + "dev", { "name": "beta", "prerelease": true diff --git a/cmd/version.go b/cmd/version.go new file mode 100644 index 0000000..b922e47 --- /dev/null +++ b/cmd/version.go @@ -0,0 +1,42 @@ +// Copyright 2024 The casbin Authors. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package cmd + +import ( + "fmt" + + "github.com/spf13/cobra" +) + +var ( + Version = "dev" + CasbinVersion = "dev" +) + +func init() { + rootCmd.Flags().BoolP("version", "v", false, "Print version information") + + oldRun := rootCmd.Run + rootCmd.Run = func(cmd *cobra.Command, args []string) { + if v, _ := cmd.Flags().GetBool("version"); v { + fmt.Printf("casbin-go-cli version: %s\n", Version) + fmt.Printf("casbin version: %s\n", CasbinVersion) + return + } + if oldRun != nil { + oldRun(cmd, args) + } + } +} diff --git a/go.sum b/go.sum index d051a2d..d68e0c9 100644 --- a/go.sum +++ b/go.sum @@ -3,21 +3,15 @@ github.com/casbin/casbin/v2 v2.97.0/go.mod h1:jX8uoN4veP85O/n2674r2qtfSXI6myvxW8 github.com/casbin/govaluate v1.1.0 h1:6xdCWIpE9CwHdZhlVQW+froUrCsjb6/ZYNcXODfLT+E= github.com/casbin/govaluate v1.1.0/go.mod h1:G/UnbIjZk/0uMNaLwZZmFQrR72tYRZWQkO70si/iR7A= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM= github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -26,5 +20,4 @@ golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=