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

Heighliner github action (backport #193) #206

Merged
merged 3 commits into from
Jul 17, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 14, 2023

This is an automatic backport of pull request #193 done by Mergify.
Cherry-pick of 968ea30 has failed:

On branch mergify/bp/release/v3.0.x/pr-193
Your branch is up to date with 'origin/release/v3.0.x'.

You are currently cherry-picking commit 968ea30.
  (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:
	deleted:    Dockerfile

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/docker-publish.yaml
	deleted by us:   .github/workflows/e2e-tests.yaml

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 968ea30)

# Conflicts:
#	.github/workflows/docker-publish.yaml
#	.github/workflows/e2e-tests.yaml
@mergify mergify bot added the conflicts label Jul 14, 2023
@mergify mergify bot assigned agouin Jul 14, 2023
@mergify mergify bot mentioned this pull request Jul 14, 2023
@boojamya boojamya enabled auto-merge (squash) July 17, 2023 23:23
@boojamya boojamya merged commit a867e2d into release/v3.0.x Jul 17, 2023
@boojamya boojamya deleted the mergify/bp/release/v3.0.x/pr-193 branch July 17, 2023 23:23
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.

2 participants