Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Apr 26, 2023

This is an automatic backport of pull request #7997 done by Mergify.
Cherry-pick of 3df9db0 has failed:

On branch mergify/bp/v3.10.x/pr-7997
Your branch is up to date with 'origin/v3.10.x'.

You are currently cherry-picking commit 3df9db0840.
  (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:   .github/workflows/update-otp-patches.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/update-elixir-patches.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

…7991) (backport #7996) (#7997)

* Update the automation to bump erlang/elixir patches in CI (backport #7991) (#7996)

* Update the automation to bump erlang/elixir patches in CI

so that the workflow fails if the branch already exists, instead of
just skipping

We had a period of many weeks where the elixir workflow was being
skipped because the branch was left around after a PR was closed, so
we want to avoid that in the future

(cherry picked from commit bb6c503)

# Conflicts:
#	.github/workflows/update-elixir-patches.yaml
#	.github/workflows/update-otp-patches.yaml

* Fixup backport

---------

Co-authored-by: Rin Kuryloski <kuryloskip@vmware.com>
(cherry picked from commit d59a1db)

# Conflicts:
#	.github/workflows/update-elixir-patches.yaml
#	.github/workflows/update-otp-patches.yaml

* Fixup backport

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Rin Kuryloski <kuryloskip@vmware.com>
(cherry picked from commit 3df9db0)

# Conflicts:
#	.github/workflows/update-elixir-patches.yaml
@mergify mergify bot added the conflicts label Apr 26, 2023
@HoloRin HoloRin merged commit cea1af9 into v3.10.x Apr 26, 2023
@HoloRin HoloRin deleted the mergify/bp/v3.10.x/pr-7997 branch April 26, 2023 09:07
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