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](backport #25671) Update Go version to 1.16.4 #25994

Merged
merged 2 commits into from
May 31, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 28, 2021

This is an automatic backport of pull request #25671 done by Mergify.
Cherry-pick of 4dc5285 has failed:

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

You are currently cherry-picking commit 4dc5285ae.
  (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:   .go-version
	modified:   CHANGELOG-developer.next.asciidoc
	modified:   CHANGELOG.next.asciidoc
	modified:   NOTICE.txt
	modified:   auditbeat/Dockerfile
	modified:   dev-tools/mage/crossbuild.go
	modified:   dev-tools/mage/gotest_test.go
	modified:   filebeat/Dockerfile
	modified:   generator/common/beatgen/setup/setup.go
	modified:   go.mod
	modified:   go.sum
	modified:   heartbeat/Dockerfile
	modified:   journalbeat/Dockerfile
	modified:   journalbeat/magefile.go
	modified:   libbeat/Dockerfile
	modified:   metricbeat/Dockerfile
	modified:   metricbeat/module/http/_meta/Dockerfile
	modified:   packetbeat/Dockerfile
	modified:   x-pack/elastic-agent/Dockerfile
	modified:   x-pack/functionbeat/Dockerfile
	modified:   x-pack/libbeat/Dockerfile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   libbeat/docs/version.asciidoc

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/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/

Update to go v1.16.4. Change MacOS cross compile to use
debian 10 image and 10.14 of the SDK. Fix arm7 packaging.

(cherry picked from commit 4dc5285)

# Conflicts:
#	libbeat/docs/version.asciidoc
@mergify mergify bot requested a review from a team as a code owner May 28, 2021 16:03
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels May 28, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label May 28, 2021
@botelastic
Copy link

botelastic bot commented May 28, 2021

This pull request doesn't have a Team:<team> label.

@elasticmachine
Copy link
Collaborator

elasticmachine commented May 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

Expand to view the summary

Build stats

  • Build Cause: michel-laterman commented: /test

  • Start Time: 2021-05-28T22:51:46.567+0000

  • Duration: 91 min 22 sec

  • Commit: baa386f

Trends 🧪

Image of Build Times

❕ Flaky test report

No test was executed to be analysed.

@michel-laterman
Copy link
Contributor

/test

@michel-laterman
Copy link
Contributor

@kvch, are these the same e2e test failures as they were on the PR to master? Is it safe to ignore?

@kvch
Copy link
Contributor

kvch commented May 31, 2021

Yes. The error is unrelated to your change.

@michel-laterman michel-laterman merged commit 7cc2b30 into 7.x May 31, 2021
@michel-laterman michel-laterman deleted the mergify/bp/7.x/pr-25671 branch May 31, 2021 14:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport conflicts There is a conflict in the backported pull request needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants