Skip to content
This repository has been archived by the owner on Dec 26, 2022. It is now read-only.

Commit

Permalink
Merge pull request #1986 from grapl-security/twunderlich/update-pants…
Browse files Browse the repository at this point in the history
…-syntax

Update syntax to pants 2.13
  • Loading branch information
twunderlich-grapl committed Sep 15, 2022
2 parents 5e4c88a + 1a7c8e3 commit 83ccffc
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,11 @@ DOCKER_DGRAPH_FILTER_LABEL := maintainer="Dgraph Labs <contact@dgraph.io>"
DOCKER_DATA_VOLUME_FILTERS := --filter=name=grapl-data

# Run a Pants goal across all proto files
PANTS_PROTO_FILTER := ./pants filter --target-type=protobuf_sources :: | xargs ./pants
PANTS_PROTO_FILTER := ./pants --filter-target-type=protobuf_sources
# Run a Pants goal across all Python files
PANTS_PYTHON_FILTER := ./pants filter --target-type=python_sources,python_tests :: | xargs ./pants
PANTS_PYTHON_FILTER := ./pants --filter-target-type=python_sources,python_tests
# Run a Pants goal across all shell files
PANTS_SHELL_FILTER := ./pants filter --target-type=shell_sources,shunit2_tests :: | xargs ./pants
PANTS_SHELL_FILTER := ./pants --filter-target-type=shell_sources,shunit2_tests

# Helper macro for invoking a target from src/rust/Makefile
RUST_MAKE = $(MAKE) --directory=src/rust
Expand Down Expand Up @@ -373,15 +373,15 @@ lint-prettier: ## Run ts/js/yaml lint checks

.PHONY: lint-proto
lint-proto: ## Lint all protobuf definitions
$(PANTS_PROTO_FILTER) lint
$(PANTS_PROTO_FILTER) lint ::

.PHONY: lint-proto-breaking
lint-proto-breaking: ## Check protobuf definitions for breaking changes
${DOCKER_COMPOSE_CHECK} buf-breaking-change

.PHONY: lint-python
lint-python: ## Run Python lint checks
$(PANTS_PYTHON_FILTER) lint
$(PANTS_PYTHON_FILTER) lint ::

.PHONY: lint-rust
lint-rust: lint-rust-clippy
Expand All @@ -398,7 +398,7 @@ lint-rust-rustfmt: ## Check to see if Rust code is properly formatted

.PHONY: lint-shell
lint-shell: ## Run Shell lint checks
$(PANTS_SHELL_FILTER) lint
$(PANTS_SHELL_FILTER) lint ::

##@ Formatting 💅

Expand Down Expand Up @@ -427,19 +427,19 @@ format-prettier: ## Reformat js/ts/yaml

.PHONY: format-proto
format-proto: ## Reformat all Protobuf definitions
$(PANTS_PROTO_FILTER) fmt
$(PANTS_PROTO_FILTER) fmt ::

.PHONY: format-python
format-python: ## Reformat all Python code
$(PANTS_PYTHON_FILTER) fmt
$(PANTS_PYTHON_FILTER) fmt ::

.PHONY: format-rust
format-rust: ## Reformat all Rust code
$(RUST_MAKE) format

.PHONY: format-shell
format-shell: ## Reformat all shell code
$(PANTS_SHELL_FILTER) fmt
$(PANTS_SHELL_FILTER) fmt ::

##@ Local Grapl 💻

Expand Down

0 comments on commit 83ccffc

Please sign in to comment.