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

ci: change to use GitHub actions (backport #239) #250

Merged
merged 2 commits into from
Jun 14, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 14, 2024

Which issue(s) this PR fixes:

longhorn/longhorn#8039, longhorn/longhorn#8504

What this PR does / why we need it:

Special notes for your reviewer:

Additional documentation or context


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

@mergify mergify bot requested a review from a team as a code owner June 14, 2024 02:29
@mergify mergify bot added the conflicts label Jun 14, 2024
Copy link
Author

mergify bot commented Jun 14, 2024

Cherry-pick of a30baa6 has failed:

On branch mergify/bp/v1.6.x/pr-239
Your branch is up to date with 'origin/v1.6.x'.

You are currently cherry-picking commit a30baa6.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by them: .drone.yml

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

Cherry-pick of 8df21c2 has failed:

On branch mergify/bp/v1.6.x/pr-239
Your branch is ahead of 'origin/v1.6.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 8df21c2.
  (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:
	new file:   .github/workflows/build.yml
	modified:   Dockerfile.dapper
	modified:   scripts/build
	modified:   scripts/package

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   package/Dockerfile

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

Signed-off-by: PoAn Yang <[email protected]>
(cherry picked from commit a30baa6)
Signed-off-by: PoAn Yang <[email protected]>
(cherry picked from commit 8df21c2)
@innobead innobead merged commit 8a8ad80 into v1.6.x Jun 14, 2024
5 checks passed
@innobead innobead deleted the mergify/bp/v1.6.x/pr-239 branch June 14, 2024 09:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants