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

[4.5.x] chore: fix aws s3 from parameter #5383

Merged
merged 1 commit into from
Jan 16, 2025
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 16, 2025

This is an automatic copy of pull request #5379 done by Mergify.


fix pipeline error The user-provided path ~/release/ does not exist.


Cherry-pick of 1c5de5a has failed:

On branch mergify/bp/4.5.x/pr-5379
Your branch is up to date with 'origin/4.5.x'.

You are currently cherry-picking commit 1c5de5a00.
  (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:   .circleci/workflows.yml

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 conflicts label Jan 16, 2025
@mergify mergify bot requested a review from a team as a code owner January 16, 2025 15:48
Copy link
Contributor Author

mergify bot commented Jan 16, 2025

Cherry-pick of 1c5de5a has failed:

On branch mergify/bp/4.5.x/pr-5379
Your branch is up to date with 'origin/4.5.x'.

You are currently cherry-picking commit 1c5de5a00.
  (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:   .circleci/workflows.yml

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

@podlesrafal podlesrafal force-pushed the mergify/bp/4.5.x/pr-5379 branch from 89a5587 to 63f2f8f Compare January 16, 2025 16:22
(cherry picked from commit 1c5de5a)

# Conflicts:
#	.circleci/workflows.yml
@podlesrafal podlesrafal force-pushed the mergify/bp/4.5.x/pr-5379 branch from 63f2f8f to ac2d61b Compare January 16, 2025 16:28
@podlesrafal podlesrafal merged commit 27b2f18 into 4.5.x Jan 16, 2025
4 of 8 checks passed
@podlesrafal podlesrafal deleted the mergify/bp/4.5.x/pr-5379 branch January 16, 2025 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant