diff --git a/Dockerfile.build b/Dockerfile.build index 7a2eb809c..e4b0a5044 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -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.24 | sh +RUN curl -sf https://gobinaries.com/gobuffalo/buffalo/buffalo@v0.16.26 | sh RUN go get github.com/gobuffalo/buffalo-pop/v2 RUN buffalo version diff --git a/Dockerfile.slim.build b/Dockerfile.slim.build index 8d5dfe571..121132278 100644 --- a/Dockerfile.slim.build +++ b/Dockerfile.slim.build @@ -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.24 | sh +RUN curl -sf https://gobinaries.com/gobuffalo/buffalo/buffalo@v0.16.26 | sh RUN go get github.com/gobuffalo/buffalo-pop/v2 RUN buffalo version diff --git a/genny/build/apkg.go b/genny/build/apkg.go index baed67c94..9a5479a65 100644 --- a/genny/build/apkg.go +++ b/genny/build/apkg.go @@ -1,6 +1,8 @@ package build import ( + "os/exec" + "github.com/gobuffalo/genny/v2" ) @@ -13,10 +15,15 @@ func apkg(opts *Options) (*genny.Generator, error) { g.RunFn(copyInflections) g.RunFn(copyDatabase) + g.RunFn(addDependencies) return g, nil } +func addDependencies(r *genny.Runner) error { + return r.Exec(exec.Command("go", "get", "-d")) +} + func copyDatabase(r *genny.Runner) error { defer func() { r.Disk.Remove("database.yml") diff --git a/genny/build/build_test.go b/genny/build/build_test.go index 6d187c715..cfb73d8af 100644 --- a/genny/build/build_test.go +++ b/genny/build/build_test.go @@ -56,7 +56,7 @@ func Test_New(t *testing.T) { // we should never leave any files modified or dropped r.Len(res.Files, 0) - cmds := []string{"go build -tags bar -o bin/foo", "go mod tidy"} + cmds := []string{"go get -d", "go build -tags bar -o bin/foo", "go mod tidy"} r.Len(res.Commands, len(cmds)) for i, c := range res.Commands { eq(r, cmds[i], c) @@ -84,7 +84,7 @@ func Test_NewWithoutBuildDeps(t *testing.T) { res := run.Results() - cmds := []string{"go build -tags bar -o bin/foo"} + cmds := []string{"go get -d", "go build -tags bar -o bin/foo"} r.Len(res.Commands, len(cmds)) for i, c := range res.Commands { eq(r, cmds[i], c) diff --git a/runtime/version.go b/runtime/version.go index e23a3e250..ca0cfd260 100644 --- a/runtime/version.go +++ b/runtime/version.go @@ -1,4 +1,4 @@ package runtime // Version is the current version of the buffalo binary -var Version = "v0.16.24" +var Version = "v0.16.26"