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

Dependencies update #805

Merged
merged 2 commits into from
May 29, 2024
Merged

Dependencies update #805

merged 2 commits into from
May 29, 2024

Conversation

l-trotta
Copy link
Contributor

@l-trotta l-trotta commented May 9, 2024

No description provided.

Copy link
Member

@swallez swallez left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@l-trotta l-trotta merged commit 7ce6f5a into main May 29, 2024
7 checks passed
@l-trotta l-trotta deleted the dependency-update branch May 29, 2024 10:26
Copy link

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-805-to-7.17
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick --mainline 1 7ce6f5a984cff10118a6bcb7b9f59c346e83e199
# Push it to GitHub
git push --set-upstream origin backport-805-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-805-to-7.17.

github-actions bot pushed a commit that referenced this pull request May 29, 2024
* dependencies update

* comments
github-actions bot pushed a commit that referenced this pull request May 29, 2024
* dependencies update

* comments
l-trotta added a commit that referenced this pull request May 29, 2024
l-trotta added a commit that referenced this pull request May 29, 2024
* dependencies update

* comments

Co-authored-by: Laura Trotta <153528055+l-trotta@users.noreply.github.com>
l-trotta added a commit that referenced this pull request May 29, 2024
* dependencies update

* comments

Co-authored-by: Laura Trotta <153528055+l-trotta@users.noreply.github.com>
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.

None yet

2 participants