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

Turn off BuildBuddy integration (backport #11343) (backport #11390) (backport #11416) #11424

Merged
merged 9 commits into from
Jun 12, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 10, 2024

in favor of GCS for remote cache, and github actions runners for execution


This is an automatic backport of pull request #11343 done by Mergify.
This is an automatic backport of pull request #11390 done by Mergify.
This is an automatic backport of pull request #11416 done by Mergify.

…11416)

* Turn off BuildBuddy integration (#11343)

Builds now execute on the github actions workers, using Google Cloud Storage (GCS) as a cache

(cherry picked from commit a6874e3)

# Conflicts:
#	.github/workflows/update-elixir-patches.yaml
#	.github/workflows/update-otp-patches.yaml
#	MODULE.bazel
#	WORKSPACE
#	deps/rabbitmq_peer_discovery_consul/test/system_SUITE_data/consul.hcl
(cherry picked from commit 2c62185)

# Conflicts:
#	.bazelrc
#	.github/workflows/rabbitmq_peer_discovery_aws.yaml
#	.github/workflows/templates/test-mixed-versions.template.yaml
#	.github/workflows/templates/test.template.yaml
#	.github/workflows/test-mixed-versions.yaml
#	.github/workflows/test.yaml
#	MODULE.bazel
#	bazel/platforms/BUILD.bazel

* fixup backport

(cherry picked from commit dd62ac1)

# Conflicts:
#	.github/workflows/update-elixir-patches.yaml
#	.github/workflows/update-otp-patches.yaml

* remove rabbitmq_amqp_client tests from this branch

as the plugin does not exist here

(cherry picked from commit 28ee2dd)

# Conflicts:
#	.github/workflows/test-mixed-versions.yaml

* Reduce bazel sandbox for rabbitmq_amqp1_0 tests in CI

since they use java

(cherry picked from commit 0d5c0e5)

* Install daemonize as needed in the peer_discovery_etcd suite

(cherry picked from commit 23f6e5c)

* fixup backport

* oauth2_client does not exist on this branch

and rabbitmq_prelaunch will run as part of the rabbit shards

* Use erlang 25.0/elixir 1.14 for mixed version tests

---------

Co-authored-by: Rin Kuryloski <rin.kuryloski@broadcom.com>
(cherry picked from commit c78563a)

# Conflicts:
#	.bazelrc
#	.github/workflows/rabbitmq_peer_discovery_aws.yaml
#	.github/workflows/test-mixed-versions.yaml
#	.github/workflows/test.yaml
#	.github/workflows/update-elixir-patches.yaml
#	.github/workflows/update-otp-patches.yaml
#	MODULE.bazel
#	WORKSPACE
#	bazel/platforms/BUILD.bazel
@mergify mergify bot added the conflicts label Jun 10, 2024
Copy link
Author

mergify bot commented Jun 10, 2024

Cherry-pick of c78563a has failed:

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

You are currently cherry-picking commit c78563a335.
  (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
	new file:   .github/workflows/test-plugin-mixed.yaml
	new file:   .github/workflows/test-plugin.yaml
	modified:   Makefile
	modified:   bazel/bzlmod/extensions.bzl

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   .bazelrc
	both modified:   .github/workflows/rabbitmq_peer_discovery_aws.yaml
	both modified:   .github/workflows/test-mixed-versions.yaml
	both modified:   .github/workflows/test.yaml
	deleted by them: .github/workflows/update-elixir-patches.yaml
	deleted by them: .github/workflows/update-otp-patches.yaml
	both modified:   MODULE.bazel
	both modified:   WORKSPACE
	deleted by them: bazel/platforms/BUILD.bazel

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

@pjk25 pjk25 marked this pull request as draft June 10, 2024 16:35
@pjk25 pjk25 force-pushed the mergify/bp/v3.11.x/pr-11416 branch from 63143e9 to 853963d Compare June 10, 2024 20:20
@pjk25 pjk25 marked this pull request as ready for review June 12, 2024 12:00
@pjk25 pjk25 merged commit 89426bb into v3.11.x Jun 12, 2024
123 checks passed
@pjk25 pjk25 deleted the mergify/bp/v3.11.x/pr-11416 branch June 12, 2024 12:00
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.

1 participant