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 from drone ci to github actions (backport #44) #45

Merged
merged 1 commit into from
May 8, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented May 8, 2024

related to harvester/harvester#5327


This is an automatic backport of pull request #44 done by Mergify.

@mergify mergify bot added the conflicts label May 8, 2024
Copy link
Author

mergify bot commented May 8, 2024

Cherry-pick of 93b8872 has failed:

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

You are currently cherry-picking commit 93b8872.
  (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:   .dockerignore
	modified:   .github/workflows/codeql.yml
	new file:   .github/workflows/master.yml
	new file:   .github/workflows/pull-request.yml
	modified:   .github/workflows/scan.yml
	new file:   .github/workflows/tag.yml
	new file:   .github/workflows/template-build.yml
	modified:   .gitignore
	modified:   package/Dockerfile
	modified:   scripts/default
	modified:   scripts/entry
	modified:   scripts/package
	modified:   scripts/version

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .drone.yml
	both modified:   Dockerfile.dapper
	deleted by us:   package/Dockerfile.webhook
	both modified:   scripts/build
	both modified:   scripts/ci
	deleted by us:   scripts/package-webhook

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

@brandboat
Copy link
Member

v0.1.x branch doesn't support arm and node-manager-webhook. So I manually update the commit here.

@brandboat brandboat merged commit 03c8184 into v0.1.x May 8, 2024
4 checks passed
@brandboat brandboat deleted the mergify/bp/v0.1.x/pr-44 branch May 8, 2024 09:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants