Skip to content

[9.2] (backport #12168) updatecli: no submodules and remove 7.17 filter if using filter-branches#12223

Closed
mergify[bot] wants to merge 1 commit into9.2from
mergify/bp/9.2/pr-12168
Closed

[9.2] (backport #12168) updatecli: no submodules and remove 7.17 filter if using filter-branches#12223
mergify[bot] wants to merge 1 commit into9.2from
mergify/bp/9.2/pr-12168

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 13, 2026

What does this PR do?

  • 7.17 branch does not exist, therefore filter-branches is enough
  • submodules are not required for some of the updatecli pipelines.

Why is it important?

Tidy up things

Checklist

  • I have read and understood the pull request guidelines of this project.
  • 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/fragments using the changelog tool
  • I have added an integration test or an E2E test

Disruptive User Impact

How to test this PR locally

Related issues

Questions to ask yourself

  • How are we going to support this in production?
  • How are we going to measure its adoption?
  • How are we going to debug this?
  • What are the metrics I should take care of?
  • ...

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

…hes (#12168)

(cherry picked from commit 9159bd2)

# Conflicts:
#	.github/workflows/bump-beats-version.yml
#	.github/workflows/bump-edot-images.yml
#	.github/workflows/bump-golang.yml
#	.github/workflows/bump-vm-images.yml
@mergify mergify bot requested a review from a team as a code owner January 13, 2026 10:39
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 13, 2026
@mergify mergify bot requested a review from a team as a code owner January 13, 2026 10:39
@mergify mergify bot requested review from michel-laterman and swiatekm and removed request for a team January 13, 2026 10:39
@mergify mergify bot added conflicts There is a conflict in the backported pull request backport labels Jan 13, 2026
@mergify mergify bot assigned v1v Jan 13, 2026
@mergify
Copy link
Contributor Author

mergify bot commented Jan 13, 2026

Cherry-pick of 9159bd2 has failed:

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

You are currently cherry-picking commit 9159bd2c2.
  (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)

Changes to be committed:
	modified:   .ci/updatecli/updatecli-bump-edot.yml
	modified:   .ci/updatecli/updatecli-bump-golang.yml
	modified:   .ci/updatecli/updatecli-bump-vm-images.yml
	modified:   .github/workflows/bump-agent-versions.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/bump-beats-version.yml
	both modified:   .github/workflows/bump-edot-images.yml
	both modified:   .github/workflows/bump-golang.yml
	both modified:   .github/workflows/bump-vm-images.yml

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

@v1v
Copy link
Member

v1v commented Jan 13, 2026

unrequired

@v1v v1v closed this Jan 13, 2026
@mergify mergify bot deleted the mergify/bp/9.2/pr-12168 branch January 13, 2026 10:43
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 skip-changelog

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant