Skip to content
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

Jump to bottom

[chore] add remove-toolchain make cmd #35490

Merged
merged 6 commits into from
Oct 1, 2024
Merged

[chore] add remove-toolchain make cmd #35490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bd93fb3
add new makefile cmds
mowies Sep 24, 2024
62519f8
add back toolchain directive to otelcontribcol to satisfy pipeline
mowies Sep 30, 2024
bd0e746
make genoteltestbedcol
mowies Sep 30, 2024
94579c8
debugging
mowies Sep 30, 2024
ea5ed22
revert
mowies Sep 30, 2024
db9dd0f
remove debug changes
mowies Sep 30, 2024
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
7 changes: 6 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ gogci:
gotidy:
$(MAKE) $(FOR_GROUP_TARGET) TARGET="tidy"

.PHONY: remove-toolchain
remove-toolchain:
$(MAKE) $(FOR_GROUP_TARGET) TARGET="toolchain"

.PHONY: gomoddownload
gomoddownload:
$(MAKE) $(FOR_GROUP_TARGET) TARGET="moddownload"
Expand Down Expand Up @@ -404,11 +408,12 @@ update-otel:$(MULTIMOD)
$(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
$(call updatehelper,$(CORE_VERSIONS),$(GOMOD),./cmd/otelcontribcol/builder-config.yaml)
$(call updatehelper,$(CORE_VERSIONS),$(GOMOD),./cmd/otelcontribcol/builder-config.yaml)
$(call updatehelper,$(CORE_VERSIONS),$(GOMOD),./cmd/oteltestbedcol/builder-config.yaml)
$(MAKE) genotelcontribcol
$(MAKE) genoteltestbedcol
$(MAKE) oteltestbedcol
$(MAKE) remove-toolchain

.PHONY: otel-from-tree
otel-from-tree:
Expand Down
4 changes: 4 additions & 0 deletions Makefile.Common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,10 @@ tidy:
rm -fr go.sum
$(GOCMD) mod tidy -compat=1.22.0

.PHONY: toolchain
toolchain:
$(GOCMD) get toolchain@none

.PHONY: misspell
misspell: $(TOOLS_BIN_DIR)/misspell
@echo "running $(MISSPELL)"
Expand Down
2 changes: 0 additions & 2 deletions exporter/dorisexporter/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/exporter/dorise

go 1.22.0

toolchain go1.22.7

require (
github.com/cenkalti/backoff/v4 v4.3.0
// cannot use higher version: https://github.com/go-sql-driver/mysql/issues/1602
Expand Down