Skip to content

[7.17] updatecli: verify commits for golang and beats (backport #13107)#13109

Merged
mergify[bot] merged 2 commits into7.17from
mergify/bp/7.17/pr-13107
May 8, 2024
Merged

[7.17] updatecli: verify commits for golang and beats (backport #13107)#13109
mergify[bot] merged 2 commits into7.17from
mergify/bp/7.17/pr-13107

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented May 8, 2024

Motivation/summary

Leverage updatecli/updatecli#1914 and support commit signature verifications

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

Related issues

Similar to #13103


This is an automatic backport of pull request #13107 done by Mergify.

(cherry picked from commit 8182fb1)

# Conflicts:
#	.ci/bump-golang.yml
#	.github/workflows/bump-golang.yml
#	.github/workflows/update-beats.yml
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 8, 2024
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented May 8, 2024

Cherry-pick of 8182fb1 has failed:

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

You are currently cherry-picking commit 8182fb130.
  (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/update-beats.yml
	modified:   .github/workflows/bump-elastic-stack.yml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .ci/bump-golang.yml
	deleted by us:   .github/workflows/bump-golang.yml
	both modified:   .github/workflows/update-beats.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

@mergify mergify bot assigned v1v May 8, 2024
@v1v v1v removed the conflicts There is a conflict in the backported pull request label May 8, 2024
@mergify mergify bot merged commit bf615d0 into 7.17 May 8, 2024
@mergify mergify bot deleted the mergify/bp/7.17/pr-13107 branch May 8, 2024 09:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant