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

Add py-lxml #59288

Merged
merged 4 commits into from
Nov 3, 2024
Merged

Add py-lxml #59288

merged 4 commits into from
Nov 3, 2024

Conversation

nicogodet
Copy link
Member

Description

Add the last remaining python dependency for VCPKG build.
No more error at opening a fresh build

@github-actions github-actions bot added this to the 3.42.0 milestone Oct 31, 2024
Copy link

github-actions bot commented Oct 31, 2024

🧮 Vcpkg update report

Added packages:
🍓 libxslt: 1.1.37#4 (Features: core, default-features)

Updated packages:
🍇 py-sip: 6.8.6 -> 6.8.6#1
🍇 vcpkg-python-scripts: 2024-05-12#2 -> 2024-05-12#3

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit 74298ed)

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit 74298ed)

@nicogodet
Copy link
Member Author

@m-kuhn --x-feature="3d" --x-feature="bindings" --x-feature="gui" --x-feature="opencl" --x-feature="quick" --x-feature="server" --allow-unsupported should be added to

vcpkg install --dry-run --triplet ${{ inputs.triplet }} --x-manifest-root=${{ inputs.vcpkg-manifest-dir }} > /tmp/vcpkg-head-output.txt
and
vcpkg install --dry-run --triplet ${{ inputs.triplet }} --x-manifest-root=.base-ref/${{ inputs.vcpkg-manifest-dir }} > /tmp/vcpkg-base-output.txt
to report complete update

@m-kuhn
Copy link
Member

m-kuhn commented Nov 2, 2024

Good catch

We should add another input param, comma separated and set it to 3d,gui,bindings in the workflow and then preprocess this somehow

This way we can later on externalize the action

@nicogodet
Copy link
Member Author

Thanks for the additional nice touch 👌🏼

@m-kuhn m-kuhn merged commit a6c88b0 into qgis:master Nov 3, 2024
31 checks passed
@m-kuhn
Copy link
Member

m-kuhn commented Nov 3, 2024

Thanks for the additional nice touch 👌🏼

Thank you for the proactive testing

@qgis-bot
Copy link
Collaborator

qgis-bot commented Nov 3, 2024

The backport to release-3_40 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply c5f6647e8b1... add py-lxml
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".
hint: Disable this message with "git config advice.mergeConflict false"

stdout
Auto-merging vcpkg/vcpkg.json
CONFLICT (content): Merge conflict in vcpkg/vcpkg.json

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

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Nov 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_40 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants