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.

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

makefile: add gazelle alias for bazel-gazelle #6876

Merged
merged 1 commit into from
May 6, 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
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -499,7 +499,7 @@ dep-ensure: dep-prereqs
rm -rf vendor/k8s.io/code-generator/cmd/go-to-protobuf/
rm -rf vendor/k8s.io/code-generator/cmd/import-boss/
rm -rf vendor/github.com/docker/docker/contrib/
make bazel-gazelle
make gazelle


.PHONY: gofmt
Expand Down Expand Up @@ -723,10 +723,14 @@ bazel-push-aws-run: bazel-push
ssh ${TARGET} chmod +x /tmp/nodeup
ssh -t ${TARGET} sudo SKIP_PACKAGE_UPDATE=1 /tmp/nodeup --conf=/var/cache/kubernetes-install/kube_env.yaml --v=8

.PHONY: bazel-gazelle
bazel-gazelle:
.PHONY: gazelle
gazelle:
hack/update-bazel.sh

.PHONY: bazel-gazelle
bazel-gazelle: gazelle
echo "bazel-gazelle is deprecated; please just use 'make gazelle'"

.PHONY: check-markdown-links
check-markdown-links:
docker run -t -v $$PWD:/tmp \
Expand Down
2 changes: 1 addition & 1 deletion docs/development/bazel.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ make bazel-test

Regenerate bazel files using gazelle:
```
make bazel-gazelle
make gazelle
```

## Other changes needed
Expand Down
2 changes: 1 addition & 1 deletion docs/development/new_kubernetes_version.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
### Run gazelle

```bash
make bazel-gazelle
make gazelle
```

### Check go version used in k/k
Expand Down