Skip to content

Commit

Permalink
Stop tagging the root module with 6.XX.0-devel (#31608)
Browse files Browse the repository at this point in the history
  • Loading branch information
FlorentClarret authored Nov 29, 2024
1 parent 96c83b8 commit 83ed39b
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions tasks/libs/common/gomodules.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,15 +255,14 @@ def __compute_dependencies(self):
# Remove github.com/DataDog/datadog-agent/ from each line
return [line[len(AGENT_MODULE_PATH_PREFIX) :] for line in output.strip().splitlines()]

# FIXME: Change when Agent 6 and Agent 7 releases are decoupled
def tag(self, agent_version):
"""Return the module tag name for a given Agent version.
>>> mods = [GoModule("."), GoModule("pkg/util/log")]
>>> [mod.tag("7.27.0") for mod in mods]
[["6.27.0", "7.27.0"], ["pkg/util/log/v0.27.0"]]
[["7.27.0"], ["pkg/util/log/v0.27.0"]]
"""
if self.path == ".":
return ["6" + agent_version[1:], "7" + agent_version[1:]]
return ["7" + agent_version[1:]]

return [f"{self.path}/{self.__version(agent_version)}"]

Expand Down

0 comments on commit 83ed39b

Please sign in to comment.