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: move drone to github action (backport #101) #104

Open
wants to merge 4 commits into
base: v0.5.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 20, 2024

Problem:
move image related work to github action

Solution:
migrate from drone to github

Related Issue:
harvester/harvester#5327

Test plan:
None


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

Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>
(cherry picked from commit 9185587)

# Conflicts:
#	.drone.yml
    - Also use buildx instead docker to build image

Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>
(cherry picked from commit 2435f64)

# Conflicts:
#	Dockerfile.dapper
Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>
(cherry picked from commit 6e81dbe)
    - NDM did not need this

Signed-off-by: Vicente Cheng <vicente.cheng@suse.com>
(cherry picked from commit aa45662)
@mergify mergify bot added the conflicts label May 20, 2024
Copy link
Author

mergify bot commented May 20, 2024

Cherry-pick of 9185587 has failed:

On branch mergify/bp/v0.5.x/pr-101
Your branch is up to date with 'origin/v0.5.x'.

You are currently cherry-picking commit 9185587.
  (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/dev.yaml
	new file:   .github/workflows/factory.yaml
	new file:   .github/workflows/release.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .drone.yml

Cherry-pick of 2435f64 has failed:

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

You are currently cherry-picking commit 2435f64.
  (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:   package/Dockerfile
	modified:   scripts/build
	modified:   scripts/package

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

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

@Vicente-Cheng Vicente-Cheng added stale This PR is pending v0.5.x v0.5.x is corresponding Harvester v1.2.x labels May 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts stale This PR is pending v0.5.x v0.5.x is corresponding Harvester v1.2.x
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant