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

feat: remove alpine:3 (backport #614) #615

Closed
wants to merge 1 commit into from
Closed

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 15, 2023

This is an automatic backport of pull request #614 done by Mergify.
Cherry-pick of a520d68 has failed:

On branch mergify/bp/v1.2/pr-614
Your branch is up to date with 'origin/v1.2'.

You are currently cherry-picking commit a520d68.
  (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 <file>..." to mark resolution)
	both modified:   scripts/images/harvester-additional-images.txt

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

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

Signed-off-by: PoAn Yang <[email protected]>
(cherry picked from commit a520d68)

# Conflicts:
#	scripts/images/harvester-additional-images.txt
@mergify mergify bot added the conflicts label Dec 15, 2023
@mergify mergify bot mentioned this pull request Dec 15, 2023
@FrankYang0529
Copy link
Member

Use #616 to remove alpine:3. Close the PR.

@FrankYang0529 FrankYang0529 deleted the mergify/bp/v1.2/pr-614 branch December 15, 2023 07:44
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.

1 participant