Skip to content

[8.17](backport #45286) fix: asdf issues with updatecli in the tool-versions#45287

Closed
mergify[bot] wants to merge 1 commit into8.17from
mergify/bp/8.17/pr-45286
Closed

[8.17](backport #45286) fix: asdf issues with updatecli in the tool-versions#45287
mergify[bot] wants to merge 1 commit into8.17from
mergify/bp/8.17/pr-45286

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jul 10, 2025

Proposed commit message

Some issues when using asdf and no plugins available for the updatecli, let's use a different file for now.

See #45199 (comment)

More context, #43743 introduced the .tool-versions file, but it only contained an entry for the updatecli, as asdf is used, let's avoid surprises with some asdf plugins and other things.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Disruptive User Impact

Author's Checklist

  • [ ]

How to test this PR locally

Related issues

Use cases

Screenshots

Logs


This is an automatic backport of pull request #45286 done by [Mergify](https://mergify.com).

(cherry picked from commit 68600b7)

# Conflicts:
#	.github/workflows/bump-elastic-stack-snapshot.yml
#	.github/workflows/bump-golang.yml
#	.github/workflows/updatecli-compose.yml
#	.updatecli-version
@mergify mergify Bot added backport conflicts There is a conflict in the backported pull request labels Jul 10, 2025
@mergify mergify Bot requested review from a team as code owners July 10, 2025 12:52
@mergify mergify Bot requested review from AndersonQ and khushijain21 and removed request for a team July 10, 2025 12:52
@mergify mergify Bot added the backport label Jul 10, 2025
@mergify mergify Bot assigned v1v Jul 10, 2025
@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Jul 10, 2025
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jul 10, 2025

Cherry-pick of 68600b7 has failed:

On branch mergify/bp/8.17/pr-45286
Your branch is up to date with 'origin/8.17'.

You are currently cherry-picking commit 68600b701.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .github/workflows/bump-elastic-stack-snapshot.yml
	both modified:   .github/workflows/bump-golang.yml
	both modified:   .github/workflows/updatecli-compose.yml
	deleted by us:   .updatecli-version

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jul 10, 2025
@botelastic
Copy link
Copy Markdown

botelastic Bot commented Jul 10, 2025

This pull request doesn't have a Team:<team> label.

@v1v v1v closed this Jul 10, 2025
@mergify mergify Bot deleted the mergify/bp/8.17/pr-45286 branch July 10, 2025 12:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant