Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Sep 20, 2023

This is an automatic backport of pull request #9486 done by Mergify.
Cherry-pick of 75eb062 has failed:

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

You are currently cherry-picking commit 75eb0621fc.
  (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:   .bazelrc
	modified:   .github/workflows/check-build-system-equivalence.yaml
	modified:   .github/workflows/oci.yaml
	modified:   .github/workflows/test-authnz.yaml
	modified:   .github/workflows/test-selenium.yaml
	modified:   .github/workflows/update-otp-patches.yaml
	modified:   MODULE.bazel
	modified:   WORKSPACE
	modified:   bazel/platforms/BUILD.bazel
	modified:   packaging/docker-image/BUILD.bazel

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/check-build-system-equivalence-release-branches.yaml
	both modified:   .github/workflows/test-windows.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 75eb062)

# Conflicts:
#	.github/workflows/check-build-system-equivalence-release-branches.yaml
#	.github/workflows/test-windows.yaml
@mergify mergify bot added the conflicts label Sep 20, 2023
@mergify mergify bot added the bazel label Sep 20, 2023
@michaelklishin michaelklishin merged commit a9a9185 into v3.12.x Sep 20, 2023
@michaelklishin michaelklishin deleted the mergify/bp/v3.12.x/pr-9486 branch September 20, 2023 22:53
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