Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Vendor generated file" #1534

Merged
merged 1 commit into from May 3, 2017
Merged

Revert "Vendor generated file" #1534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 1 addition & 6 deletions .github/CONTRIBUTING.md
View file
Open in desktop
Expand Up @@ -61,8 +61,7 @@ Here's a full example:
$ ./script/glide.sh get github.com/foo/bar
# install another dependency, this time for the integration tests
$ ( cd integration && ../script/glide.sh get github.com/baz/quuz )
# generate
# (required to merge non-code components into the final binary, such as the web dashboard and provider's Go templates)
# generate (Only required to integrate other components such as web dashboard)
$ go generate
# Standard go build
$ go build
Expand All @@ -73,10 +72,6 @@ $ gox "linux darwin" "386 amd64 arm" \
# run other commands like tests
```

### Updating the templates

If you happen to update the provider templates (in `/templates`), you need to run `go generate` to update the `autogen` package.

### Tests

##### Method 1: `Docker` and `make`
Expand Down
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
@@ -1,4 +1,5 @@
/dist
/autogen/gen.go
.idea
.intellij
*.iml
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Expand Up @@ -46,7 +46,7 @@ test-integration: build ## run the integration tests
$(DOCKER_RUN_TRAEFIK) ./script/make.sh generate binary test-integration

validate: build ## validate gofmt, golint and go vet
$(DOCKER_RUN_TRAEFIK) ./script/make.sh validate-glide validate-gofmt validate-govet validate-golint validate-misspell validate-vendor validate-autogen
$(DOCKER_RUN_TRAEFIK) ./script/make.sh validate-glide validate-gofmt validate-govet validate-golint validate-misspell validate-vendor

build: dist
docker build $(DOCKER_BUILD_ARGS) -t "$(TRAEFIK_DEV_IMAGE)" -f build.Dockerfile .
Expand Down