Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make update #6318

Merged
merged 11 commits into from
Oct 16, 2021
Merged

make update #6318

merged 11 commits into from
Oct 16, 2021

Conversation

stuartnelson3
Copy link
Contributor

Motivation/summary

upgrade beats and go 1.17.1

How to test these changes

non-functional change

@stuartnelson3 stuartnelson3 requested a review from a team October 11, 2021 14:27
@mergify
Copy link
Contributor

mergify bot commented Oct 11, 2021

This pull request does not have a backport label. Could you fix it @stuartnelson3? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

  • backport-7.x is the label to automatically backport to the 7.x branch.
  • backport-7./d is the label to automatically backport to the 7./d branch. /d is the digit

NOTE: backport-skip has been added to this pull request.

@mergify mergify bot added the backport-skip Skip notification from the automated backport with mergify label Oct 11, 2021
@apmmachine
Copy link
Contributor

apmmachine commented Oct 11, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview preview

Expand to view the summary

Build stats

  • Start Time: 2021-10-16T02:47:44.707+0000

  • Duration: 51 min 21 sec

  • Commit: f10e2b1

Test stats 🧪

Test Results
Failed 0
Passed 6273
Skipped 18
Total 6291

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /hey-apm : Run the hey-apm benchmark.

  • /package : Generate and publish the docker images.

Copy link
Contributor

@simitt simitt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you look into why the packaging step failed pleaase?

@mergify
Copy link
Contributor

mergify bot commented Oct 14, 2021

This pull request is now in conflicts. Could you fix it @stuartnelson3? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b go-1.17 upstream/go-1.17
git merge upstream/master
git push upstream go-1.17

@mergify
Copy link
Contributor

mergify bot commented Oct 15, 2021

This pull request is now in conflicts. Could you fix it @stuartnelson3? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b go-1.17 upstream/go-1.17
git merge upstream/master
git push upstream go-1.17

@axw
Copy link
Member

axw commented Oct 16, 2021

@bmorelli25 @simitt in f10e2b1 I've updated the Makefile to stop regenerating fields.asciidoc.

I did this mostly because of the changes in #6287, which mean that the generated file is broken. After 7.16 we won't be updating the old libbeat fields.yml files anymore, so fields.asciidoc will not be updated either. Hence we can stop regenerating it and just use what's checked in now.

@axw axw merged commit 4a4658e into elastic:master Oct 16, 2021
@axw axw mentioned this pull request Oct 18, 2021
@stuartnelson3 stuartnelson3 deleted the go-1.17 branch October 25, 2021 08:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-skip Skip notification from the automated backport with mergify
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants