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

[7.x] chore: update-beats goal to bump the go version (backport #5778) #5811

Merged
merged 2 commits into from
Jul 28, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jul 28, 2021

This is an automatic backport of pull request #5778 done by Mergify.
Cherry-pick of bcd5bb6 has failed:

On branch mergify/bp/7.x/pr-5778
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit bcd5bb6a.
  (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:   .gitignore
	modified:   Makefile

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .ci/scripts/update-beats.sh
	both modified:   README.md

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 refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

(cherry picked from commit bcd5bb6)

# Conflicts:
#	.ci/scripts/update-beats.sh
#	README.md
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jul 28, 2021
@mergify mergify bot assigned v1v Jul 28, 2021
@axw axw removed the conflicts There is a conflict in the backported pull request label Jul 28, 2021
@axw axw enabled auto-merge (squash) July 28, 2021 02:02
@apmmachine
Copy link
Contributor

apmmachine commented Jul 28, 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-07-28T02:02:52.853+0000

  • Duration: 44 min 0 sec

  • Commit: b20b5b8

Test stats 🧪

Test Results
Failed 0
Passed 4541
Skipped 15
Total 4556

Trends 🧪

Image of Build Times

Image of Tests

@axw axw merged commit dc2d955 into 7.x Jul 28, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-5778 branch July 28, 2021 02:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants