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

Remove remaining buildbuddy usage (backport #11478) (backport #11488) (backport #11500) #11512

Closed
wants to merge 5 commits into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 20, 2024

Some nightly or less-often run suites had not been updated


This is an automatic backport of pull request #11478 done by Mergify.
This is an automatic backport of pull request #11488 done by Mergify.
This is an automatic backport of pull request #11500 done by Mergify.

pjk25 and others added 5 commits June 20, 2024 13:01
(cherry picked from commit a2709df)

# Conflicts:
#	.github/workflows/perform-bazel-execution-comparison.yaml
#	bazel/bzlmod/secondary_umbrella.bzl
(cherry picked from commit b38dc84)

# Conflicts:
#	bazel/bzlmod/secondary_umbrella.bzl
(cherry picked from commit f28ec6c)

# Conflicts:
#	.github/workflows/test-erlang-git.yaml
#	.github/workflows/test-windows.yaml
#	bazel/bzlmod/secondary_umbrella.bzl
(cherry picked from commit f280891)

# Conflicts:
#	.github/workflows/perform-bazel-execution-comparison.yaml
#	bazel/bzlmod/secondary_umbrella.bzl
(cherry picked from commit 9166522)

# Conflicts:
#	bazel/bzlmod/secondary_umbrella.bzl
(cherry picked from commit 91b4d0f)

# Conflicts:
#	.github/workflows/perform-bazel-execution-comparison.yaml
#	bazel/bzlmod/secondary_umbrella.bzl
(cherry picked from commit 76e0da1)

# Conflicts:
#	bazel/bzlmod/secondary_umbrella.bzl
@mergify mergify bot added the conflicts label Jun 20, 2024
Copy link
Author

mergify bot commented Jun 20, 2024

Cherry-pick of f28ec6c has failed:

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

You are currently cherry-picking commit f28ec6c5ed.
  (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
	modified:   .github/workflows/test-mixed-versions.yaml
	modified:   .github/workflows/test-selenium.yaml
	modified:   user-template.bazelrc

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .github/workflows/test-erlang-git.yaml
	both modified:   .github/workflows/test-windows.yaml
	both modified:   bazel/bzlmod/secondary_umbrella.bzl

Cherry-pick of 9166522 has failed:

On branch mergify/bp/v3.11.x/pr-11500
Your branch is ahead of 'origin/v3.11.x' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 91665228cc.
  (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:   bazel/bzlmod/secondary_umbrella.bzl

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 91b4d0f has failed:

On branch mergify/bp/v3.11.x/pr-11500
Your branch is ahead of 'origin/v3.11.x' by 2 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 91b4d0f5b1.
  (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/rm <file>..." as appropriate to mark resolution)
	deleted by them: .github/workflows/perform-bazel-execution-comparison.yaml
	both modified:   bazel/bzlmod/secondary_umbrella.bzl

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 76e0da1 has failed:

On branch mergify/bp/v3.11.x/pr-11500
Your branch is ahead of 'origin/v3.11.x' by 3 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 76e0da11d7.
  (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:   bazel/bzlmod/secondary_umbrella.bzl

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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the bazel label Jun 20, 2024
@pjk25 pjk25 closed this Jun 20, 2024
@pjk25 pjk25 deleted the mergify/bp/v3.11.x/pr-11500 branch June 20, 2024 13:14
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