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

Touchup Dockerfile and create a workflow building it (backport #323) #324

Merged
merged 2 commits into from
Jun 29, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 29, 2023

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

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

You are currently cherry-picking commit dbb7c65.
  (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/humble-docker-build.yaml
	new file:   .github/workflows/rolling-docker-build.yaml
	modified:   Dockerfile/Dockerfile

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/rolling-binary-build.yml

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

(cherry picked from commit dbb7c65)

# Conflicts:
#	.github/workflows/rolling-binary-build.yml
Copy link
Collaborator

@olivier-stasse olivier-stasse left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@christophfroehlich christophfroehlich merged commit ae0a7d3 into humble Jun 29, 2023
@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-323 branch June 29, 2023 20:14
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