Skip to content

Commit

Permalink
[chore] Remove unused yq tool (open-telemetry#9073)
Browse files Browse the repository at this point in the history
It's not need after
open-telemetry#8024
  • Loading branch information
dmitryax authored Dec 11, 2023
1 parent c27d2cd commit 0d8801f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@ push-tags: $(MULTIMOD)
done;

.PHONY: check-changes
check-changes: $(YQ)
check-changes: $(MULTIMOD)
# NOTE: ! inverses the return code of multimod diff. This is
# because prepare-release expects a 0 if there are diffs and
# non-0 if there are no diffs, which is the inverse of most
Expand Down
6 changes: 1 addition & 5 deletions Makefile.Common
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,16 @@ MULTIMOD := $(TOOLS_BIN_DIR)/multimod
PORTO := $(TOOLS_BIN_DIR)/porto
SEMCONVGEN := $(TOOLS_BIN_DIR)/semconvgen
SEMCONVKIT := $(TOOLS_BIN_DIR)/semconvkit
YQ := $(TOOLS_BIN_DIR)/yq

.PHONY: install-tools
install-tools: $(TOOLS_BIN_NAMES) $(YQ)
install-tools: $(TOOLS_BIN_NAMES)

$(TOOLS_BIN_DIR):
mkdir -p $@

$(TOOLS_BIN_NAMES): $(TOOLS_BIN_DIR) $(TOOLS_MOD_DIR)/go.mod
cd $(TOOLS_MOD_DIR) && $(GOCMD) build -o $@ -trimpath $(filter %/$(notdir $@),$(TOOLS_PKG_NAMES))

$(YQ): $(TOOLS_BIN_DIR) $(TOOLS_MOD_DIR)/go.mod
cd $(TOOLS_MOD_DIR) && $(GOCMD) build -o $@ -trimpath github.com/mikefarah/yq/v4

.PHONY: test
test:
$(GOTEST) $(GOTEST_OPT) ./...
Expand Down

0 comments on commit 0d8801f

Please sign in to comment.