Skip to content

Commit 87ae10a

Browse files
led0nkjriguera
authored andcommitted
make update-otel (open-telemetry#34694)
**Description:** <Describe what has changed.> <!--Ex. Fixing a bug - Describe the bug and how this fixes the issue. Ex. Adding a feature - Explain what this achieves.--> **Link to tracking Issue:** <Issue number if applicable> - Resolves open-telemetry#21632 **Testing:** <Describe what testing was performed and which tests were added.> **Documentation:** <Describe the documentation added.> So at first i reordered the `update-otel` command, because there was no sense in first updating the builder-configs (with the use of go.mod file) and then updating `go.mod`-files. Furthermore since the main `go.mod`-file has moved: open-telemetry@cfd83af#diff-33ef32bf6c23acb95f5902d7097b7a1d5128ca061167ec0716715b0b9eeaa5f6 I changed the source-file to `cmd/otelcontribcol/go.mod`
1 parent 7716bf9 commit 87ae10a

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ OTEL_STABLE_VERSION=main
88
VERSION=$(shell git describe --always --match "v[0-9]*" HEAD)
99
TRIMMED_VERSION=$(shell grep -o 'v[^-]*' <<< "$(VERSION)" | cut -c 2-)
1010
CORE_VERSIONS=$(SRC_PARENT_DIR)/opentelemetry-collector/versions.yaml
11-
GOMOD=$(SRC_ROOT)/go.mod
11+
GOMOD=$(SRC_ROOT)/cmd/otelcontribcol/go.mod
1212

1313
COMP_REL_PATH=cmd/otelcontribcol/components.go
1414
MOD_NAME=github.com/open-telemetry/opentelemetry-collector-contrib
@@ -387,9 +387,9 @@ update-otel:$(MULTIMOD)
387387
git add . && git commit -s -m "[chore] multimod update stable modules" ; \
388388
$(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m beta --commit-hash $(OTEL_VERSION)
389389
git add . && git commit -s -m "[chore] multimod update beta modules" ; \
390+
$(MAKE) gotidy
390391
$(call updatehelper,$(CORE_VERSIONS),$(GOMOD),./cmd/otelcontribcol/builder-config.yaml)
391392
$(call updatehelper,$(CORE_VERSIONS),$(GOMOD),./cmd/oteltestbedcol/builder-config.yaml)
392-
$(MAKE) gotidy
393393
$(MAKE) genotelcontribcol
394394
$(MAKE) genoteltestbedcol
395395
$(MAKE) oteltestbedcol

0 commit comments

Comments
 (0)