From 0d8801fa67bb5529454d0ab654288be214c8d076 Mon Sep 17 00:00:00 2001 From: Dmitrii Anoshin Date: Mon, 11 Dec 2023 15:08:46 -0800 Subject: [PATCH] [chore] Remove unused yq tool (#9073) It's not need after https://github.com/open-telemetry/opentelemetry-collector/pull/8024 --- Makefile | 2 +- Makefile.Common | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 764e89a05ec..bfee6971f11 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/Makefile.Common b/Makefile.Common index 82c2dcced4a..487e377233e 100644 --- a/Makefile.Common +++ b/Makefile.Common @@ -33,10 +33,9 @@ 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 $@ @@ -44,9 +43,6 @@ $(TOOLS_BIN_DIR): $(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) ./...