Skip to content

[CI] bump gvm version and use the binary (backport #24571)#28672

Merged
v1v merged 4 commits into6.8from
mergify/bp/6.8/pr-24571
Nov 1, 2021
Merged

[CI] bump gvm version and use the binary (backport #24571)#28672
v1v merged 4 commits into6.8from
mergify/bp/6.8/pr-24571

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Oct 27, 2021

This is an automatic backport of pull request #24571 done by Mergify.
Cherry-pick of 34e5c09 has failed:

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

You are currently cherry-picking commit 34e5c09bd.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/scripts/install-go.sh
	both modified:   .ci/scripts/install-tools.bat
	both modified:   Vagrantfile

no changes added to commit (use "git add" and/or "git commit -a")

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/

@mergify mergify Bot added the conflicts There is a conflict in the backported pull request label Oct 27, 2021
@botelastic botelastic Bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 27, 2021
Comment thread .ci/scripts/install-go.sh Outdated
Comment thread .ci/scripts/install-tools.bat Outdated
Comment thread .ci/scripts/install-tools.bat Outdated
Comment thread Vagrantfile Outdated
Comment thread Vagrantfile Outdated
Comment thread Vagrantfile Outdated
@v1v v1v removed the conflicts There is a conflict in the backported pull request label Oct 27, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 27, 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-27T14:09:01.825+0000

  • Duration: 48 min 4 sec

  • Commit: 5091199

Test stats 🧪

Test Results
Failed 0
Passed 3604
Skipped 138
Total 3742

🤖 GitHub comments

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

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

@v1v
Copy link
Copy Markdown
Member

v1v commented Oct 27, 2021

@Mergifyio rebase

v1v added 4 commits October 27, 2021 14:08
(cherry picked from commit 34e5c09)

# Conflicts:
#	.ci/scripts/install-go.sh
#	.ci/scripts/install-tools.bat
#	Vagrantfile
@v1v v1v force-pushed the mergify/bp/6.8/pr-24571 branch from a78b385 to 5091199 Compare October 27, 2021 14:08
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Oct 27, 2021

rebase

✅ Branch has been successfully rebased

Details

@jsoriano
Copy link
Copy Markdown
Member

@v1v should this be merged? Thanks!

@v1v v1v merged commit bd7d8af into 6.8 Nov 1, 2021
@mergify mergify Bot deleted the mergify/bp/6.8/pr-24571 branch November 1, 2021 09:56
@v1v v1v self-assigned this Nov 1, 2021
@v1v v1v added automation Team:Automation Label for the Observability productivity team labels Nov 1, 2021
@botelastic botelastic Bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

automation Team:Automation Label for the Observability productivity team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants