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 check for Qwt>=6.2.0 for QWT_POLAR #57023

Merged
merged 2 commits into from
Apr 3, 2024
Merged

Fix check for Qwt>=6.2.0 for QWT_POLAR #57023

merged 2 commits into from
Apr 3, 2024

Conversation

MehdiChinoune
Copy link
Contributor

Also set QWT_POLAR_VERSION=0x060200

Description

It was checking a wrong variable.

This is part of 720d22d

@github-actions github-actions bot added this to the 3.38.0 milestone Apr 2, 2024
Also set QWT_POLAR_VERSION=0x060200
@MehdiChinoune MehdiChinoune changed the title Fix check for Qwt>6.2.0 for QWT_POLAR Fix check for Qwt>=6.2.0 for QWT_POLAR Apr 2, 2024
Copy link

github-actions bot commented Apr 2, 2024

🪟 Windows builds ready!

Windows builds of this PR are available for testing here. Debug symbols for this build are available here.

(Built from commit 97b19f4)

@m-kuhn
Copy link
Member

m-kuhn commented Apr 2, 2024

@stefanuhrig do you have an idea what happened to the hana test?

@MehdiChinoune
Copy link
Contributor Author

I think the failure is due actions/runner-images#9557

@m-kuhn
Copy link
Member

m-kuhn commented Apr 3, 2024

Thanks @MehdiChinoune !

@m-kuhn m-kuhn merged commit 4a631ee into qgis:master Apr 3, 2024
30 checks passed
@MehdiChinoune MehdiChinoune deleted the patch-2 branch April 3, 2024 04:43
@stefanuhrig
Copy link
Contributor

@m-kuhn As far as I can see, the hana test issue has been resolved. If there are any further issues, please reach out to me.

@qgis-bot
Copy link
Collaborator

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 78305b5fbb4... Fix check for Qwt>=6.2.0 for QWT_POLAR
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 .github/workflows/mingw-w64-msys2.yml
CONFLICT (content): Merge conflict in .github/workflows/mingw-w64-msys2.yml
Auto-merging src/app/CMakeLists.txt
CONFLICT (content): Merge conflict in src/app/CMakeLists.txt

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

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Apr 11, 2024
@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 78305b5fbb4... Fix check for Qwt>=6.2.0 for QWT_POLAR
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 .github/workflows/mingw-w64-msys2.yml
CONFLICT (content): Merge conflict in .github/workflows/mingw-w64-msys2.yml
Auto-merging src/app/CMakeLists.txt
CONFLICT (content): Merge conflict in src/app/CMakeLists.txt

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-57023-to-queued_ltr_backports
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 78305b5fbb47a4414e0ff25553862e95262203b5,97b19f453f3fa71bac91eefd95e334e4385827f1
# Push it to GitHub
git push --set-upstream origin backport-57023-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-57023-to-queued_ltr_backports.

.ci/run_tests.sh Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport queued_ltr_backports Queued Backports backport release-3_34 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants