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

Add elixir 1.15.2 (backport #8748) #8759

Merged
merged 13 commits into from
Jul 5, 2023
Merged

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 4, 2023

This is an automatic backport of pull request #8748 done by Mergify.
Cherry-pick of 21978a3 has failed:

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

You are currently cherry-picking commit 21978a3234.
  (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:   MODULE.bazel
	modified:   WORKSPACE

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   bazel/platforms/BUILD.bazel

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

pjk25 added 12 commits July 4, 2023 20:06
(cherry picked from commit 21978a3)

# Conflicts:
#	bazel/platforms/BUILD.bazel
(cherry picked from commit 42d29a5)
(cherry picked from commit 9c66e73)
(cherry picked from commit 8cf0adb)
(cherry picked from commit 59f5494)
(cherry picked from commit 1be7b00)
@mergify mergify bot added the conflicts label Jul 4, 2023
@mergify mergify bot assigned pjk25 Jul 4, 2023
@mergify mergify bot added the bazel label Jul 4, 2023
@michaelklishin michaelklishin merged commit acef50b into v3.12.x Jul 5, 2023
16 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v3.12.x/pr-8748 branch July 5, 2023 00:39
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.

None yet

2 participants