Skip to content
This repository was archived by the owner on Sep 17, 2024. It is now read-only.

[7.16](backport #1984) Update fetchBeatsBinary to be reused in elastic-agent-poc#2010

Merged
mdelapenya merged 4 commits into7.16from
mergify/bp/7.16/pr-1984
Jan 19, 2022
Merged

[7.16](backport #1984) Update fetchBeatsBinary to be reused in elastic-agent-poc#2010
mdelapenya merged 4 commits into7.16from
mergify/bp/7.16/pr-1984

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Jan 17, 2022

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

On branch mergify/bp/7.16/pr-1984
Your branch is up to date with 'origin/7.16'.

You are currently cherry-picking commit d3365c99.
  (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:   internal/utils/utils.go
	modified:   internal/utils/utils_test.go
	modified:   pkg/downloads/versions_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/downloads/versions.go

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.com

* update func

* fix path

* work on download

* small fix

* remove test

* add sha to google

* fix typo

* add comment

(cherry picked from commit d3365c9)

# Conflicts:
#	pkg/downloads/versions.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jan 17, 2022
@mergify mergify bot assigned narph Jan 17, 2022
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Jan 17, 2022

💚 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: 2022-01-18T17:30:53.575+0000

  • Duration: 32 min 3 sec

  • Commit: 227b68a

Test stats 🧪

Test Results
Failed 0
Passed 210
Skipped 0
Total 210

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

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

  • /test : Re-trigger the build.

@mdelapenya mdelapenya removed the conflicts There is a conflict in the backported pull request label Jan 18, 2022
@mdelapenya mdelapenya merged commit 428dc63 into 7.16 Jan 19, 2022
@mergify mergify bot deleted the mergify/bp/7.16/pr-1984 branch January 19, 2022 09:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants