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) #11500

Merged
merged 5 commits into from
Jun 20, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 19, 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.

(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 f280891)

# Conflicts:
#	.github/workflows/perform-bazel-execution-comparison.yaml
#	bazel/bzlmod/secondary_umbrella.bzl
Copy link
Author

mergify bot commented Jun 19, 2024

Cherry-pick of b38dc84 has failed:

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

You are currently cherry-picking commit b38dc84db5.
  (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 <file>..." to mark resolution)
	both modified:   bazel/bzlmod/secondary_umbrella.bzl

Cherry-pick of f280891 has failed:

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

You are currently cherry-picking commit f28089177a.
  (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")

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 19, 2024
@michaelklishin michaelklishin deleted the mergify/bp/v3.12.x/pr-11488 branch June 19, 2024 18:20
@pjk25 pjk25 restored the mergify/bp/v3.12.x/pr-11488 branch June 20, 2024 12:46
@pjk25 pjk25 reopened this Jun 20, 2024
@pjk25 pjk25 force-pushed the mergify/bp/v3.12.x/pr-11488 branch from 7505c44 to af05892 Compare June 20, 2024 12:49
@pjk25 pjk25 merged commit f7da6c0 into v3.12.x Jun 20, 2024
90 of 94 checks passed
@pjk25 pjk25 deleted the mergify/bp/v3.12.x/pr-11488 branch June 20, 2024 13:00
mergify bot pushed a commit that referenced this pull request Jun 20, 2024
(cherry picked from commit 91b4d0f)

# Conflicts:
#	.github/workflows/perform-bazel-execution-comparison.yaml
#	bazel/bzlmod/secondary_umbrella.bzl
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