Skip to content

Commit

Permalink
updated version string and go.mod (#675)
Browse files Browse the repository at this point in the history
* updated version string and go.mod

* fixed spaces to tab. just running gofmt and go mod after that?
  • Loading branch information
sio4 committed Nov 30, 2021
1 parent 8acb58f commit 8573d1c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions genny/model/templates/path-/name-.go.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (
{{- if eq $.model.Encoding.String "jsonapi"}}
type {{.model.Name.Proper}} struct {
{{- range $a := .opts.Attrs }}
{{$a.Name.Pascalize}} {{$a.GoType}} `jsonapi:"{{ if eq $a.Name.Underscore.String "id" }}primary{{ else }}attr{{ end }},{{$a.Name.Underscore}}" db:"{{$a.Name.Underscore}}"`
{{$a.Name.Pascalize}} {{$a.GoType}} `jsonapi:"{{ if eq $a.Name.Underscore.String "id" }}primary{{ else }}attr{{ end }},{{$a.Name.Underscore}}" db:"{{$a.Name.Underscore}}"`
{{- end }}
{{- else }}
type {{.model.Name.Proper}} struct {
{{- range $a := .opts.Attrs }}
{{$a.Name.Pascalize}} {{$a.GoType}} `{{$.model.Encoding}}:"{{$a.Name.Underscore}}" db:"{{$a.Name.Underscore}}"`
{{$a.Name.Pascalize}} {{$a.GoType}} `{{$.model.Encoding}}:"{{$a.Name.Underscore}}" db:"{{$a.Name.Underscore}}"`
{{- end }}
{{- end }}
}
Expand Down
2 changes: 1 addition & 1 deletion soda/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var RootCmd = &cobra.Command{
SilenceUsage: true,
Short: "A tasty treat for all your database needs",
PersistentPreRun: func(c *cobra.Command, args []string) {
fmt.Printf("%s\n\n", Version)
fmt.Printf("pop %s\n\n", Version)
// CLI flag has priority
if !c.PersistentFlags().Changed("env") {
env = defaults.String(os.Getenv("GO_ENV"), env)
Expand Down
3 changes: 2 additions & 1 deletion soda/cmd/version.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package cmd

// Version defines the current Pop version.
const Version = "v5.3.1"
// this version will also be used by soda(also buffalo-pop)
const Version = "v6.0.1"

0 comments on commit 8573d1c

Please sign in to comment.