Skip to content
This repository has been archived by the owner on Feb 24, 2024. It is now read-only.

Fix build issues with golang 1.16 #2113

Merged
merged 2 commits into from
Jun 16, 2021
Merged

Fix build issues with golang 1.16 #2113

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
231222d
Fix build issue #2074
Jun 15, 2021
ae9dd73
Stick with go 1.15 for compatibility
Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN npm install -g --no-progress yarn \
# Install golangci
RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0
# Installing buffalo binary
RUN curl -sf https://gobinaries.com/gobuffalo/buffalo/buffalo@v0.16.23 | sh
RUN curl -sf https://gobinaries.com/gobuffalo/buffalo/buffalo@v0.16.24 | sh
RUN go get github.com/gobuffalo/buffalo-pop/v2
RUN buffalo version

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.slim.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN npm i -g --no-progress yarn \
&& yarn config set yarn-offline-mirror-pruning true

# Pulling docker binary from releases
RUN curl -sf https://gobinaries.com/gobuffalo/buffalo/buffalo@v0.16.23| sh
RUN curl -sf https://gobinaries.com/gobuffalo/buffalo/buffalo@v0.16.24 | sh
RUN go get github.com/gobuffalo/buffalo-pop/v2
RUN buffalo version

Expand Down
6 changes: 3 additions & 3 deletions genny/build/build.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ func New(opts *Options) (*genny.Generator, error) {
if err != nil {
return g, err
}
g.Command(c)

g.RunFn(Cleanup(opts))

g.Command(c)
g.RunFn(func(r *genny.Runner) error {
events.EmitPayload(EvtBuildStop, events.Payload{"opts": opts})
return nil
})

g.RunFn(Cleanup(opts))
return g, nil
}
40 changes: 20 additions & 20 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
module github.com/gobuffalo/buffalo

go 1.15
go 1.16
fasmat marked this conversation as resolved.
Show resolved Hide resolved

require (
github.com/BurntSushi/toml v0.3.1
github.com/dustin/go-humanize v1.0.0
github.com/fatih/color v1.9.0
github.com/fatih/color v1.12.0
github.com/gobuffalo/attrs v1.0.0
github.com/gobuffalo/buffalo-pop/v2 v2.0.4
github.com/gobuffalo/buffalo-pop/v2 v2.3.0
github.com/gobuffalo/clara/v2 v2.0.2
github.com/gobuffalo/envy v1.9.0
github.com/gobuffalo/events v1.4.1
Expand All @@ -16,32 +16,32 @@ require (
github.com/gobuffalo/github_flavored_markdown v1.1.0
github.com/gobuffalo/helpers v0.6.2
github.com/gobuffalo/httptest v1.5.0
github.com/gobuffalo/logger v1.0.3
github.com/gobuffalo/logger v1.0.4
github.com/gobuffalo/meta v0.3.0
github.com/gobuffalo/nulls v0.2.0
github.com/gobuffalo/nulls v0.4.0
github.com/gobuffalo/packd v1.0.0
github.com/gobuffalo/packr/v2 v2.8.0
github.com/gobuffalo/plush/v4 v4.1.4
github.com/gobuffalo/pop/v5 v5.3.3
github.com/gobuffalo/packr/v2 v2.8.1
github.com/gobuffalo/plush/v4 v4.1.5
github.com/gobuffalo/pop/v5 v5.3.4
github.com/gobuffalo/tags/v3 v3.1.0
github.com/google/go-cmp v0.4.0
github.com/gorilla/handlers v1.4.2
github.com/gorilla/mux v1.7.4
github.com/gorilla/sessions v1.2.0
github.com/google/go-cmp v0.5.6
github.com/gorilla/handlers v1.5.1
github.com/gorilla/mux v1.8.0
github.com/gorilla/sessions v1.2.1
github.com/karrick/godirwalk v1.16.1
github.com/markbates/grift v1.5.0
github.com/markbates/oncer v1.0.0
github.com/markbates/refresh v1.11.1
github.com/markbates/safe v1.0.1
github.com/markbates/sigtx v1.0.0
github.com/monoculum/formam v0.0.0-20200905010316-d7a8fbd33677
github.com/sirupsen/logrus v1.5.0
github.com/spf13/cobra v0.0.6
github.com/monoculum/formam v0.0.0-20210523135142-1af3317b7b9b
github.com/sirupsen/logrus v1.8.1
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.7.0
github.com/stretchr/testify v1.5.1
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
golang.org/x/tools v0.0.0-20200323192200-8849913b6971
github.com/spf13/viper v1.7.1
github.com/stretchr/testify v1.7.0
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/tools v0.1.3
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc
gopkg.in/yaml.v2 v2.2.8
gopkg.in/yaml.v2 v2.4.0
)
Loading