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

[8.x](backport #4072) build(deps): bump github.com/elastic/go-sysinfo from 1.14.2 to 1.15.0 #4076

Merged
merged 2 commits into from
Oct 31, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 31, 2024

Bumps github.com/elastic/go-sysinfo from 1.14.2 to 1.15.0.

Release notes

Sourced from github.com/elastic/go-sysinfo's releases.

v1.15.0

IMPROVEMENTS:

  • Fetch all IP addresses in a single stdlib call (GH-246)
Commits
  • 750e2c7 Fetch all ip addresses in a single stdlib call (#246)
  • b4a498b ci: use macos-15 and remove macos-12 (#245)
  • 323c852 Bump vmactions/freebsd-vm from 1.1.3 to 1.1.4 in the github-actions group (#244)
  • d6059b3 Revert "github-action: enable opentelemetry for tracing GitHub actions" (#243)
  • See full diff in compare view

Dependabot compatibility score

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

This is an automatic backport of pull request #4072 done by [Mergify](https://mergify.com).

…#4072)

* build(deps): bump github.com/elastic/go-sysinfo from 1.14.2 to 1.15.0

Bumps [github.com/elastic/go-sysinfo](https://github.com/elastic/go-sysinfo) from 1.14.2 to 1.15.0.
- [Release notes](https://github.com/elastic/go-sysinfo/releases)
- [Commits](elastic/go-sysinfo@v1.14.2...v1.15.0)

---
updated-dependencies:
- dependency-name: github.com/elastic/go-sysinfo
  dependency-type: indirect
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

* Post dependabot file modifications

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>
(cherry picked from commit 8d390f8)

# Conflicts:
#	testing/go.sum
@mergify mergify bot requested a review from a team as a code owner October 31, 2024 11:11
Copy link
Contributor Author

mergify bot commented Oct 31, 2024

Cherry-pick of 8d390f8 has failed:

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

You are currently cherry-picking commit 8d390f8.
  (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:   NOTICE.txt
	modified:   go.mod
	modified:   go.sum

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

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Oct 31, 2024
@swiatekm swiatekm self-assigned this Oct 31, 2024
Copy link
Contributor Author

mergify bot commented Oct 31, 2024

This pull request is now in conflicts. Could you fix it @mergify[bot]? 🙏
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 mergify/bp/8.x/pr-4072 upstream/mergify/bp/8.x/pr-4072
git merge upstream/8.x
git push upstream mergify/bp/8.x/pr-4072

@swiatekm
Copy link

@Mergifyio rebase

Copy link
Contributor Author

mergify bot commented Oct 31, 2024

rebase

☑️ Nothing to do

  • -conflict [📌 rebase requirement]
  • -closed [📌 rebase requirement]
  • queue-position = -1 [📌 rebase requirement]
  • any of:
    • #commits-behind > 0 [📌 rebase requirement]
    • #commits > 1 [📌 rebase requirement]
    • -linear-history [📌 rebase requirement]

Copy link

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@swiatekm swiatekm merged commit 1c63153 into 8.x Oct 31, 2024
8 checks passed
@swiatekm swiatekm deleted the mergify/bp/8.x/pr-4072 branch October 31, 2024 14:02
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant