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: workaround for missing libaio.so.1 on noble #59880

Merged
merged 1 commit into from
Dec 14, 2024

Conversation

t0b3
Copy link
Contributor

@t0b3 t0b3 commented Dec 13, 2024

ubuntu 24.04 got screwed and only provides libaio.so.1t64
thus we need a workaround to get oracle binaries running as expected

see upstream bug report https://bugs.launchpad.net/ubuntu/+source/libaio/+bug/2067501

@github-actions github-actions bot added this to the 3.42.0 milestone Dec 13, 2024
Copy link

github-actions bot commented Dec 13, 2024

🪟 Windows builds

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

🪟 Windows Qt6 builds

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

@t0b3 t0b3 force-pushed the oracle-db-conn branch 2 times, most recently from c8e943e to f5dda9e Compare December 13, 2024 10:47
@t0b3 t0b3 changed the title [DO_NOT_MERGE] debug - oracle db conn fix: workaround for missing libaio.so.1 on noble Dec 13, 2024
@t0b3 t0b3 marked this pull request as ready for review December 13, 2024 10:51
@t0b3 t0b3 marked this pull request as draft December 13, 2024 11:28
@t0b3 t0b3 force-pushed the oracle-db-conn branch 2 times, most recently from 109936f to fe44d0c Compare December 13, 2024 12:11
@t0b3 t0b3 marked this pull request as ready for review December 13, 2024 13:19
@t0b3
Copy link
Contributor Author

t0b3 commented Dec 13, 2024

@nyalldawson this one will fix the oracle tests

@qgis qgis deleted a comment from github-actions bot Dec 13, 2024
@nyalldawson nyalldawson merged commit 5737c98 into qgis:master Dec 14, 2024
29 of 30 checks passed
@qgis-bot
Copy link
Collaborator

The backport to release-3_40 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply b9f4fca15bf... fix: libaio on noble is incompatible for oracle client
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 .docker/qgis3-qt5-build-deps.dockerfile
CONFLICT (content): Merge conflict in .docker/qgis3-qt5-build-deps.dockerfile

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

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Dec 14, 2024
@t0b3 t0b3 deleted the oracle-db-conn branch December 14, 2024 07:30
t0b3 added a commit to t0b3/QGIS that referenced this pull request Dec 20, 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