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

Fix Node build #145

Merged
merged 1 commit into from
Jun 2, 2024
Merged

Fix Node build #145

merged 1 commit into from
Jun 2, 2024

Conversation

R0Wi
Copy link
Member

@R0Wi R0Wi commented Jun 2, 2024

No description provided.

Signed-off-by: Robin Windey <[email protected]>
@R0Wi R0Wi merged commit e454ba1 into master Jun 2, 2024
8 of 19 checks passed
@delete-merged-branch delete-merged-branch bot deleted the fix-build branch June 2, 2024 13:58
@R0Wi
Copy link
Member Author

R0Wi commented Jun 2, 2024

The backport to stable28 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-stable28 stable28
# Navigate to the new working tree
cd .worktrees/backport-stable28
# Create a new branch
git switch --create backport-145-to-stable28
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick ---mainline 1 e454ba1fae2dca3ee97077f81f90673d06fe1eef
# Push it to GitHub
git push --set-upstream origin backport-145-to-stable28
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-stable28

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

R0Wi added a commit that referenced this pull request Jun 2, 2024
Signed-off-by: Robin Windey <[email protected]>
R0Wi added a commit that referenced this pull request Jun 9, 2024
Signed-off-by: Robin Windey <[email protected]>
R0Wi added a commit that referenced this pull request Jun 9, 2024
Signed-off-by: Robin Windey <[email protected]>
R0Wi added a commit that referenced this pull request Jun 9, 2024
* Fix Node build (#145)

Signed-off-by: Robin Windey <[email protected]>

* Bump version to 1.29.1

Signed-off-by: Robin Windey <[email protected]>

---------

Signed-off-by: Robin Windey <[email protected]>
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.

1 participant