Closed mergify[bot] closed 3 months ago
Cherry-pick of a2709dfd0559c87a251c39b8d4ce25b21cd5e606 has failed:
On branch mergify/bp/v3.13.x/pr-11478
Your branch is up to date with 'origin/v3.13.x'.
You are currently cherry-picking commit a2709dfd05.
(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/templates/test-mixed-versions.template.yaml
modified: .github/workflows/test-authnz.yaml
deleted: .github/workflows/test-erlang-git.yaml
modified: .github/workflows/test-mixed-versions.yaml
modified: .github/workflows/test-selenium.yaml
modified: .github/workflows/test-windows.yaml
modified: user-template.bazelrc
Unmerged paths:
(use "git add/rm <file>..." as appropriate to mark resolution)
deleted by them: .github/workflows/perform-bazel-execution-comparison.yaml
both modified: bazel/bzlmod/secondary_umbrella.bzl
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Some nightly or less-often run suites had not been updated
This is an automatic backport of pull request #11478 done by Mergify.