Skip to content

Conversation

@stevejgordon
Copy link
Contributor

No description provided.

@stevejgordon stevejgordon force-pushed the dependency/update-SharpZipLib branch from 6df0208 to a05a2d4 Compare February 2, 2022 12:02
@stevejgordon
Copy link
Contributor Author

Test failures relate to the v2 index template API but don't occur locally. Suspect this is a timing issue. Will investigate outside of this PR.

@stevejgordon stevejgordon merged commit 2f82491 into 7.17 Feb 2, 2022
@stevejgordon stevejgordon deleted the dependency/update-SharpZipLib branch February 2, 2022 12:45
@github-actions
Copy link
Contributor

github-actions bot commented Feb 2, 2022

The backport to 7.17 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-7.17 7.17
# Navigate to the new working tree
cd .worktrees/backport-7.17
# Create a new branch
git switch --create backport-6106-to-7.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 2f82491d5827c8438cea6da9e3be630369d53f4f
# Push it to GitHub
git push --set-upstream origin backport-6106-to-7.17
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-7.17

Then, create a pull request where the base branch is 7.17 and the compare/head branch is backport-6106-to-7.17.

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.

2 participants