[7.x] Move "tool" module dependencies to tools/go.mod (backport #5827) #5838
Conversation
This file contains 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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
* Move "tool" module dependencies to tools/go.mod Move some Go module dependencies into their own go.mod under tools/, so they don't interfere with apm-server's dependencies. * Update go-elasticsearch * Update go elasticsearch (#5599) Partial cherry-pick of 39228c2 Excludes product change bits, which are not in go-elasticsearch/v8. (cherry picked from commit fef190e) # Conflicts: # go.mod # go.sum
mergify
bot
added
the
conflicts
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪 |
This was referenced Aug 2, 2021
elasticsearch/estest was only used inside the sourcemap package's tests. Remove this package and refactor tests to use an httptest.Server where feasible. Change the beater test that was using sourcemap/test for test data to use the sourcemap in testdata/sourcemap instead, and remove sourcemap/test. (cherry picked from commit 7ccc202)
Apparently these ones are required by CI to be in the top-level go.mod file. I'll see if we can fix that, but for now here we go. (cherry picked from commit aa13b93)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is an automatic backport of pull request #5827 done by Mergify.
Cherry-pick of fef190e has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/