Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Apr 26, 2023

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

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

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

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

…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
@HoloRin HoloRin marked this pull request as draft April 26, 2023 08:36
@HoloRin HoloRin marked this pull request as ready for review April 26, 2023 09:03
@HoloRin HoloRin merged commit 3df9db0 into v3.11.x Apr 26, 2023
@HoloRin HoloRin deleted the mergify/bp/v3.11.x/pr-7996 branch April 26, 2023 09:04
mergify bot added a commit that referenced this pull request Apr 26, 2023
…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
HoloRin added a commit that referenced this pull request Apr 26, 2023
Update the automation to bump erlang/elixir patches in CI (backport #7991) (backport #7996) (backport #7997)
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