[chore] revert make update-otel (#29537)

This is to unblock the release, will work on bringing it back after the release. Signed-off-by: Alex Boten <[email protected]>
open-telemetry · Nov 28, 2023 · c3d106f · c3d106f
1 parent f7c0d9c
commit c3d106f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -286,10 +286,14 @@ telemetrygen:
 	cd ./cmd/telemetrygen && GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ../../bin/telemetrygen_$(GOOS)_$(GOARCH)$(EXTENSION) \
 		-tags $(GO_BUILD_TAGS) .
 
+.PHONY: update-dep
+update-dep:
+	$(MAKE) $(FOR_GROUP_TARGET) TARGET="updatedep"
+	$(MAKE) otelcontribcol
+
 .PHONY: update-otel
-update-otel:$(MULTIMOD)
-	$(MULTIMOD) sync -a=true -s=true -o ../opentelemetry-collector --commit-hash $(OTEL_STABLE_VERSION)
-	$(MAKE) gotidy
+update-otel:
+	$(MAKE) update-dep MODULE=go.opentelemetry.io/collector VERSION=$(OTEL_VERSION) RC_VERSION=$(OTEL_RC_VERSION) STABLE_VERSION=$(OTEL_STABLE_VERSION)
 
 .PHONY: otel-from-tree
 otel-from-tree:

diff --git a/Makefile.Common b/Makefile.Common
@@ -203,3 +203,8 @@ moddownload:
 gci: $(TOOLS_BIN_DIR)/gci
 	@echo "running $(GCI)"
 	@$(GCI) write -s standard -s default -s "prefix(github.com/open-telemetry/opentelemetry-collector-contrib)" $(ALL_SRC_AND_DOC)
+
+.PHONY: updatedep
+updatedep:
+	$(PWD)/internal/buildscripts/update-dep
+	@$(MAKE) tidy