Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Apr 19, 2024

This is mainly a CI/Github Actions oriented PR. GHCR is used for caching, rabbitmq/rabbitmq:buildcache-linux-$arch.

Bazel builds should still work, such as:

  • bazel build //packaging/docker-image:rabbitmq-amd64
  • bazel build //packaging/docker-image:rabbitmq-arm64
  • bazel build //packaging/docker-image:rabbitmq

And make package-generic-unix docker-image TAR=tar works on my mac as well.

Additionally, this hybrid approach should work too:

  1. bazel build :package-generic-unix
  2. make -C packaging/docker-image GENERIC_UNIX_ARCHIVE=../../bazel-bin/package-generic-unix.tar.xz
    This is an automatic backport of pull request Use make for OCI workflow #11042 done by Mergify.

* Use make instead of bazel for the OCI workflow

(cherry picked from commit 4e720d7)

# Conflicts:
#	.github/workflows/oci-base.yaml
#	.github/workflows/oci.yaml
#	.github/workflows/rabbitmq_peer_discovery_aws.yaml
@mergify mergify bot added the conflicts label Apr 19, 2024
@mergify
Copy link
Author

mergify bot commented Apr 19, 2024

Cherry-pick of 4e720d7 has failed:

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

You are currently cherry-picking commit 4e720d7fe1.
  (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:
	new file:   .github/workflows/oci-make.yaml
	deleted:    packaging/base-image/.dockerignore
	deleted:    packaging/base-image/BUILD.bazel
	deleted:    packaging/base-image/Dockerfile
	new file:   packaging/docker-image/.gitignore
	modified:   packaging/docker-image/BUILD.bazel
	modified:   packaging/docker-image/Dockerfile
	modified:   packaging/docker-image/Makefile

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .github/workflows/oci-base.yaml
	deleted by them: .github/workflows/oci.yaml
	both modified:   .github/workflows/rabbitmq_peer_discovery_aws.yaml

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

@HoloRin HoloRin marked this pull request as draft April 19, 2024 18:09
@HoloRin HoloRin marked this pull request as ready for review April 19, 2024 18:46
@HoloRin HoloRin merged commit 95624b8 into v3.13.x Apr 19, 2024
@HoloRin HoloRin deleted the mergify/bp/v3.13.x/pr-11042 branch April 19, 2024 18:47
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