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 build on msvc #48773

Merged
merged 1 commit into from
May 27, 2022
Merged

fix build on msvc #48773

merged 1 commit into from
May 27, 2022

Conversation

jef-n
Copy link
Member

@jef-n jef-n commented May 27, 2022

broken by #48738 and #45172

@github-actions github-actions bot added this to the 3.26.0 milestone May 27, 2022
@jef-n jef-n enabled auto-merge (rebase) May 27, 2022 11:14
@jef-n jef-n merged commit 929a718 into qgis:master May 27, 2022
@qgis-bot
Copy link
Collaborator

The backport to queued_ltr_backports failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 10b31272d2... fix build on msvc
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging tests/src/core/geometry/testqgslinestring.cpp
CONFLICT (content): Merge conflict in tests/src/core/geometry/testqgslinestring.cpp

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

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label May 27, 2022
@qgis-bot
Copy link
Collaborator

The backport to release-3_22 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 10b31272d2... fix build on msvc
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging tests/src/core/geometry/testqgslinestring.cpp
CONFLICT (content): Merge conflict in tests/src/core/geometry/testqgslinestring.cpp

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

Then, create a pull request where the base branch is release-3_22 and the compare/head branch is backport-48773-to-release-3_22.

@jef-n jef-n deleted the fix-msvc-build branch May 27, 2022 20:48
@jef-n jef-n removed backport queued_ltr_backports Queued Backports backport release-3_22 failed backport The automated backport attempt failed, needs a manual backport labels May 27, 2022
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.

3 participants