merge queue: embarking main (fa22c90) and #4370 together#4810
Closed
mergify[bot] wants to merge 5 commits into
Closed
merge queue: embarking main (fa22c90) and #4370 together#4810mergify[bot] wants to merge 5 commits into
mergify[bot] wants to merge 5 commits into
Conversation
Fix multiple issues introduced by Renovate update commit: - Revert github.com/elastic/sarama from broken v1.24.1-elastic (module declares itself as github.com/Shopify/sarama) to working pseudo-version - Fix github.com/elastic/go-lumber from bare commit hash to proper pseudo-version v0.1.2-0.20240913080619-93ccc4a69e6a - Fix goja replace directive from bare commit hash to proper pseudo-version - Revert gopacket replace from downgraded commit hash to current version - Update goja_nodejs to match new transitive dep requirements - Run go mod tidy to update go.sum with correct hashes for all new versions Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
- Revert e2e-testing to v1.2.3 (v1.99.1 removed pkg/downloads package) - Revert goja replace to v0.0.0-20190128172624-dd2ac4456e20 (newer version removed RegisterSimpleMapType used by elastic/beats) - Revert goja_nodejs to v0.0.0-20171011081505-adff31b136e6 for consistency - Keep valid updates: elastic-agent-libs v0.36.0, go-ucfg v0.9.1, go-concert v0.3.1, go-seccomp-bpf v1.6.0 - Update go.sum via go mod tidy Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 task
Contributor
Author
|
Merge queue reset: an external action moved the base branch head to a7d1166 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
✨ Merge queue reset: an external action moved the base branch head to a7d1166. The pull request #4370 has been re-embarked. ✨
Branch main (fa22c90) and #4370 are embarked together for merge.
This pull request has been created by Mergify to speculatively check the mergeability of #4370.
You don't need to do anything. Mergify will close this pull request automatically when it is complete.
Required conditions of queue rule
defaultfor merge:check-success=Lintcheck-success=Manifest Testscheck-success=Package Cloudbeat (docker)check-success=Package Cloudbeat (tar.gz)check-success=Test Rego Policiescheck-success=Unit Testcheck-neutral = CLAcheck-skipped = CLAcheck-success = CLAcheck-neutral = Package Cloudbeat (docker)check-skipped = Package Cloudbeat (docker)check-success = Package Cloudbeat (docker)check-neutral = Package Cloudbeat (tar.gz)check-skipped = Package Cloudbeat (tar.gz)check-success = Package Cloudbeat (tar.gz)check-neutral = Manifest Testscheck-skipped = Manifest Testscheck-success = Manifest Testscheck-neutral = Test Rego Policiescheck-skipped = Test Rego Policiescheck-success = Test Rego Policiescheck-neutral = Lintcheck-skipped = Lintcheck-success = Lintcheck-neutral = Unit Testcheck-skipped = Unit Testcheck-success = Unit Test#approved-reviews-by >= 1[🛡 GitHub branch protection]#approved-reviews-by >= 1[🛡 GitHub repository ruleset rule[org] Require a PR for Renovate]#approved-reviews-by >= 1[🛡 GitHub repository ruleset rule[org] Require a PR]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub repository ruleset rule[org] Require a PR for Renovate]#changes-requested-reviews-by = 0[🛡 GitHub repository ruleset rule[org] Require a PR]Required conditions to stay in the queue:
#approved-reviews-by >= 1[🛡 GitHub branch protection]#approved-reviews-by >= 1[🛡 GitHub repository ruleset rule[org] Require a PR for Renovate]#approved-reviews-by >= 1[🛡 GitHub repository ruleset rule[org] Require a PR]#changes-requested-reviews-by = 0[🛡 GitHub branch protection]#changes-requested-reviews-by = 0[🛡 GitHub repository ruleset rule[org] Require a PR for Renovate]#changes-requested-reviews-by = 0[🛡 GitHub repository ruleset rule[org] Require a PR]check-success = CLAcheck-neutral = CLAcheck-skipped = CLAcheck-success = Package Cloudbeat (docker)check-neutral = Package Cloudbeat (docker)check-skipped = Package Cloudbeat (docker)check-success = Package Cloudbeat (tar.gz)check-neutral = Package Cloudbeat (tar.gz)check-skipped = Package Cloudbeat (tar.gz)check-success = Manifest Testscheck-neutral = Manifest Testscheck-skipped = Manifest Testscheck-success = Test Rego Policiescheck-neutral = Test Rego Policiescheck-skipped = Test Rego Policiescheck-success = Lintcheck-neutral = Lintcheck-skipped = Lintcheck-success = Unit Testcheck-neutral = Unit Testcheck-skipped = Unit Test