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

Removing Dep support #1833

Merged
merged 6 commits into from
Nov 12, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions Dockerfile.slim.build
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ RUN apk add --no-cache --upgrade apk-tools \
RUN go version && go get -v -u github.com/markbates/deplist/deplist


RUN go get -u github.com/golang/dep/cmd/dep \
&& go get -v -u github.com/gobuffalo/flect \
RUN go get -v -u github.com/gobuffalo/flect \
&& go get -v -u github.com/gobuffalo/makr \
&& go get -v -u github.com/gobuffalo/packr/v2 \
&& go get -v -u github.com/gobuffalo/tags \
Expand Down
5 changes: 1 addition & 4 deletions buffalo/cmd/new.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,7 @@ func parseNewOptions(args []string) (newAppOptions, error) {

app.AsAPI = viper.GetBool("api")
app.VCS = viper.GetString("vcs")
if app.WithDep {
app.WithModules = false
envy.MustSet("GO111MODULE", "off")
}

app.WithPop = !viper.GetBool("skip-pop")
app.WithWebpack = !viper.GetBool("skip-webpack")
app.WithYarn = !viper.GetBool("skip-yarn")
Expand Down
5 changes: 0 additions & 5 deletions genny/ci/templates/-dot-gitlab-ci-no-pop.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,7 @@ before_script:
- cd /go/src/{{.opts.App.PackagePkg}}
- mkdir -p public/assets
- go get -u github.com/gobuffalo/buffalo/buffalo
{{- if .opts.App.WithDep }}
- go get github.com/golang/dep/cmd/dep
- dep ensure
{{- else }}
- go get -t -v ./...
{{- end }}
- export PATH="$PATH:$GOPATH/bin"

stages:
Expand Down
5 changes: 0 additions & 5 deletions genny/ci/templates/-dot-gitlab-ci.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,7 @@ before_script:
- cd /go/src/{{.opts.App.PackagePkg}}
- mkdir -p public/assets
- go get -u github.com/gobuffalo/buffalo/buffalo
{{- if .opts.App.WithDep }}
- go get github.com/golang/dep/cmd/dep
- dep ensure
{{- else }}
- go get -t -v ./...
{{- end }}
- export PATH="$PATH:$GOPATH/bin"

stages:
Expand Down
5 changes: 0 additions & 5 deletions genny/ci/templates/-dot-travis.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,6 @@ go_import_path: {{.opts.App.PackagePkg}}

install:
- go get github.com/gobuffalo/buffalo/buffalo
{{- if .opts.App.WithDep }}
- go get github.com/golang/dep/cmd/dep
- dep ensure
{{- else }}
- go get $(go list ./... | grep -v /vendor/)
{{- end }}

script: buffalo test
4 changes: 0 additions & 4 deletions genny/docker/templates/multi/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,10 @@ RUN npm install --no-progress
{{end -}}

ADD . .
{{if .opts.App.WithDep -}}
RUN dep ensure
{{else -}}
{{if .opts.App.WithModules -}}
ENV GO111MODULE=on
{{end -}}
RUN go get ./...
{{end -}}
RUN buffalo build --static -o /bin/app

FROM alpine
Expand Down
4 changes: 0 additions & 4 deletions genny/docker/templates/standard/Dockerfile.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@ RUN npm install --no-progress
{{end -}}

ADD . .
{{if .opts.App.WithDep -}}
RUN dep ensure
{{else -}}
RUN go get $(go list ./... | grep -v /vendor/)
{{end -}}
RUN buffalo build --static -o /bin/app

# Uncomment to run the binary in "production" mode:
Expand Down