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

debian packaging: drop bullseye #58109

Merged
merged 1 commit into from
Jul 15, 2024
Merged

Conversation

jef-n
Copy link
Member

@jef-n jef-n commented Jul 15, 2024

qgis.g.info now uses G_get_projwkt / G_get_projsrid, which was introduced in GRASS 7.8.6, GRASS' version.h includes major and minor and bullseye only has 7.8.5.

qgis.g.info now uses G_get_projwkt / G_get_projsrid, which was
introduced in GRASS 7.8.6, GRASS' version.h includes major and minor and
bullseye only has 7.8.5.
@github-actions github-actions bot added this to the 3.40.0 milestone Jul 15, 2024
@nyalldawson
Copy link
Collaborator

@jef-n should we drop the grass fix for ltr branch?

@jef-n
Copy link
Member Author

jef-n commented Jul 15, 2024

You mean not backport? Yes. Only master is broken on bullseye, because of the qgis.g.info change (48bd2b7) in master.

Copy link

🪟 Windows builds ready!

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

(Built from commit ef0d8f9)

@nyalldawson
Copy link
Collaborator

@jef-n it was backported here: #58075

@jef-n
Copy link
Member Author

jef-n commented Jul 15, 2024

@jef-n it was backported here: #58075

The nightlies build the release branches.

@jef-n jef-n added the backport queued_ltr_backports Queued Backports label Jul 15, 2024
@nyalldawson nyalldawson merged commit a56f708 into qgis:master Jul 15, 2024
34 checks passed
@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 ef0d8f9d8b1... debian packaging: drop bullseye
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 debian/control.in
CONFLICT (content): Merge conflict in debian/control.in
Auto-merging debian/rules
CONFLICT (content): Merge conflict in debian/rules

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Jul 15, 2024
@nyalldawson
Copy link
Collaborator

@jef-n see #58118

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 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