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.

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

[chore] add remove-toolchain make cmd #35490

Merged
merged 6 commits into from
Oct 1, 2024

Conversation

mowies
Copy link
Member

@mowies mowies commented Sep 30, 2024

Description:

This PR adds a new remove-toolchain make command which removes the toolchain directive from all go.mod files.
The new make command is also added to the update-otel make target.

Link to tracking Issue:

Testing:

  • add a toolchain go1.22.5 directive to any of the go.mod files in this repo
  • call make remove-toolchain
  • check if the toolchain directive was removed

@mowies mowies requested review from atoulme and a team as code owners September 30, 2024 11:32
@mowies mowies changed the title remove commit cmds [chore] add remove-toolchain make cmd Sep 30, 2024
Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
@@ -4,6 +4,8 @@ module github.com/open-telemetry/opentelemetry-collector-contrib/cmd/otelcontrib

go 1.22.0

toolchain go1.22.7
Copy link
Member Author

@mowies mowies Sep 30, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

left this in since this file will be removed with #34844 anyways and this also satisfies the pipeline

Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
Copy link
Member

@songy23 songy23 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@mx-psi
Copy link
Member

mx-psi commented Oct 1, 2024

I would expect this PR to also remove the toolchain directive from e.g.

@mowies
Copy link
Member Author

mowies commented Oct 1, 2024

@mx-psi that would usually happen but otelcontribcol is specifically excluded from the go modules here.
Reasoning for that was given here

@songy23 songy23 requested a review from mx-psi October 1, 2024 12:57
@mx-psi
Copy link
Member

mx-psi commented Oct 1, 2024

Thanks for explaining!

@mx-psi mx-psi merged commit 795694c into open-telemetry:main Oct 1, 2024
156 checks passed
@github-actions github-actions bot added this to the next release milestone Oct 1, 2024
@mowies mowies deleted the toolchain-trial branch October 2, 2024 06:09
jriguera pushed a commit to springernature/opentelemetry-collector-contrib that referenced this pull request Oct 4, 2024
**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.-->

This PR adds a new `remove-toolchain` make command which removes the
`toolchain` directive from all go.mod files.
The new make command is also added to the `update-otel` make target.

**Link to tracking Issue:** <Issue number if applicable>
- fixes
open-telemetry#33600
- could potentially also work for
open-telemetry#35160

**Testing:** <Describe what testing was performed and which tests were
added.>
- add a `toolchain go1.22.5` directive to any of the go.mod files in
this repo
- call `make remove-toolchain`
- check if the toolchain directive was removed

---------

Signed-off-by: Moritz Wiesinger <moritz.wiesinger@dynatrace.com>
@mowies
Copy link
Member Author

mowies commented Oct 14, 2024

fixes #35160

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

make update-otel shouldn't update the toolchain
4 participants