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.14](backport #4859) Repoint kardianos/service to fork elastic/kardianos-service #4923

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 13, 2024

What does this PR do?

This PR repoints the dependency on github.com/kardianos/service to our fork of it at github.com/elastic/kardianos-service via a replace directive.

Why is it important?

The upstream fork at https://github.com/kardianos/service does not seem to be actively maintained based on the latest commit timestamp and the lack of response to kardianos/service#396.

More pressingly, we need a fix to kardianos/service#395.

Disruptive User Impact

No.


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

* Repoint kardianos/service to fork elastic/kardianos-service

* Adding comment

* Rename elastic/kardianos-service to elastic/go-service

* Change to github.com/elastic/go-service.

* Running mage fmt

---------

Co-authored-by: Blake Rouse <[email protected]>
(cherry picked from commit 6e55d65)

# Conflicts:
#	internal/pkg/agent/install/switch.go
@mergify mergify bot requested a review from a team as a code owner June 13, 2024 10:06
@mergify mergify bot added the backport label Jun 13, 2024
@mergify mergify bot removed the request for review from a team June 13, 2024 10:06
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Jun 13, 2024
@mergify mergify bot requested review from michalpristas and pchila June 13, 2024 10:06
Copy link
Contributor Author

mergify bot commented Jun 13, 2024

Cherry-pick of 6e55d65 has failed:

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

You are currently cherry-picking commit 6e55d65d09.
  (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
	modified:   internal/pkg/agent/application/upgrade/service_update_linux.go
	modified:   internal/pkg/agent/install/install.go
	modified:   internal/pkg/agent/install/installed.go
	modified:   internal/pkg/agent/install/svc.go
	modified:   internal/pkg/agent/install/uninstall.go
	modified:   pkg/component/runtime/service.go
	modified:   testing/integration/upgrade_rollback_test.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   internal/pkg/agent/install/switch.go

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

@ycombinator
Copy link
Contributor

Closing without merging. See #4859 (comment).

@mergify mergify bot deleted the mergify/bp/8.14/pr-4859 branch June 13, 2024 12:35
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