Skip to content

Commit c3d106f

Browse files
author
Alex Boten
authored
[chore] revert make update-otel (open-telemetry#29537)
This is to unblock the release, will work on bringing it back after the release. Signed-off-by: Alex Boten <[email protected]>
1 parent f7c0d9c commit c3d106f

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

Makefile

+7-3
Original file line numberDiff line numberDiff line change
@@ -286,10 +286,14 @@ telemetrygen:
286286
cd ./cmd/telemetrygen && GO111MODULE=on CGO_ENABLED=0 $(GOCMD) build -trimpath -o ../../bin/telemetrygen_$(GOOS)_$(GOARCH)$(EXTENSION) \
287287
-tags $(GO_BUILD_TAGS) .
288288

289+
.PHONY: update-dep
290+
update-dep:
291+
$(MAKE) $(FOR_GROUP_TARGET) TARGET="updatedep"
292+
$(MAKE) otelcontribcol
293+
289294
.PHONY: update-otel
290-
update-otel:$(MULTIMOD)
291-
$(MULTIMOD) sync -a=true -s=true -o ../opentelemetry-collector --commit-hash $(OTEL_STABLE_VERSION)
292-
$(MAKE) gotidy
295+
update-otel:
296+
$(MAKE) update-dep MODULE=go.opentelemetry.io/collector VERSION=$(OTEL_VERSION) RC_VERSION=$(OTEL_RC_VERSION) STABLE_VERSION=$(OTEL_STABLE_VERSION)
293297

294298
.PHONY: otel-from-tree
295299
otel-from-tree:

Makefile.Common

+5
Original file line numberDiff line numberDiff line change
@@ -203,3 +203,8 @@ moddownload:
203203
gci: $(TOOLS_BIN_DIR)/gci
204204
@echo "running $(GCI)"
205205
@$(GCI) write -s standard -s default -s "prefix(github.com/open-telemetry/opentelemetry-collector-contrib)" $(ALL_SRC_AND_DOC)
206+
207+
.PHONY: updatedep
208+
updatedep:
209+
$(PWD)/internal/buildscripts/update-dep
210+
@$(MAKE) tidy

0 commit comments

Comments
 (0)