Skip to content

[chore] Fix update-otel #37706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bogdandrutu merged 4 commits into from
Feb 7, 2025
Merged

[chore] Fix update-otel #37706

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6692ec6
[chore] Fix update-otel
Feb 5, 2025
fd1095c
feedback
Feb 6, 2025
8f0f51f
Merge branch 'main' into fix-update-otel-task
sincejune Feb 6, 2025
606006b
Merge branch 'main' into fix-update-otel-task
sincejune Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,18 +423,17 @@ endef

.PHONY: update-otel
update-otel:$(MULTIMOD)
# Make sure cmd/otelcontribcol/go.mod and cmd/oteltestbedcol/go.mod are present
$(MAKE) genotelcontribcol
$(MAKE) genoteltestbedcol
$(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m stable --commit-hash $(OTEL_STABLE_VERSION)
git add . && git commit -s -m "[chore] multimod update stable modules" ; \
$(MULTIMOD) sync -s=true -o ../opentelemetry-collector -m beta --commit-hash $(OTEL_VERSION)
git add . && git commit -s -m "[chore] multimod update beta modules" ; \
$(MAKE) gotidy
# Ensure the otelcontribcol is generated, update deps, then
$(MAKE) genotelcontribcol
$(call updatehelper,$(CORE_VERSIONS),./cmd/otelcontribcol/go.mod,./cmd/otelcontribcol/builder-config.yaml)
$(MAKE) genotelcontribcol
# Ensure the otelcontribcol is generated.
$(MAKE) genoteltestbedcol
$(call updatehelper,$(CORE_VERSIONS),./cmd/oteltestbedcol/go.mod,./cmd/oteltestbedcol/builder-config.yaml)
$(MAKE) genotelcontribcol
$(MAKE) genoteltestbedcol
$(MAKE) generate
$(MAKE) crosslink
Expand Down