Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Apr 23, 2024

When dependabot creates PRs, secrets are not injected, and the OCI workflow can't push the image


This is an automatic backport of pull request #11054 done by [Mergify](https://mergify.com).

When dependabot creates PRs, secrets are not injected, and the OCI
workflow can't push the image

(cherry picked from commit 07c9758)

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

mergify bot commented Apr 23, 2024

Cherry-pick of 07c9758 has failed:

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

You are currently cherry-picking commit 07c97580bd.
  (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/oci-make.yaml
	modified:   .github/workflows/test-authnz.yaml
	modified:   .github/workflows/test-selenium.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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 merged commit b839c86 into v3.13.x Apr 24, 2024
@HoloRin HoloRin deleted the mergify/bp/v3.13.x/pr-11054 branch April 24, 2024 10:06
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