Skip to content

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Mar 28, 2023

This is an automatic backport of pull request #1110 done by Mergify.
Cherry-pick of 8fe22c9 has failed:

On branch mergify/bp/stable/0.4/pr-1110
Your branch is up to date with 'origin/stable/0.4'.

You are currently cherry-picking commit 8fe22c9.
  (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:   tools/deploy_documentation.sh

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/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

coruscating and others added 2 commits August 16, 2022 19:09
### Summary

The 0.5.0 docs publishing job resulted in failure because the openssl
command to decrypt the credentials file for uploading the docs errored.
The IFS (internal field separator) variable was getting set too broadly
at the the level of the entire script instead of just the tag parsing.
This was causing the passing of the secrets for decrypting the
credential files to fail. This commit updates the IFS usage so it's not
affecting the other commands after we split the tag version. This should
fix the deploy job for future releases.

### Details and comments

(cherry picked from commit 8fe22c9)

# Conflicts:
#	tools/deploy_documentation.sh
@mergify mergify bot added the conflicts label Mar 28, 2023
@mtreinish mtreinish changed the base branch from stable/0.4 to stable/0.5 March 29, 2023 13:09
@mtreinish
Copy link
Contributor

@Mergifyio rebase

@mergify
Copy link
Author

mergify bot commented Mar 29, 2023

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/2)
Auto-merging docs/release_notes.rst
CONFLICT (content): Merge conflict in docs/release_notes.rst
error: could not apply d579d66... Updated release notes config (#890)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply d579d66... Updated release notes config (#890)

err-code: DFD58

@mtreinish mtreinish closed this Mar 29, 2023
@mergify mergify bot deleted the mergify/bp/stable/0.4/pr-1110 branch March 29, 2023 13:12
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