Fix pg18 extra image CI failures by skipping tools/osmium build in update.sh#80
Fix pg18 extra image CI failures by skipping tools/osmium build in update.sh#80sanak wants to merge 2 commits intopgRouting:masterfrom
Conversation
WalkthroughThe changes disable the compilation and installation of the osmium tools component across Docker builds in multiple branches and versions. The Changes
Estimated code review effort🎯 1 (Trivial) | ⏱️ ~3 minutes Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
🧹 Nitpick comments (2)
update.sh (2)
99-100: Flag this as a temporary workaround in a tracking issue.The inline comment already references osm2pgrouting issue
#323— nice. Consider also opening (or linking) a repo-local issue so the workaround isn't forgotten once upstream fixes the libosmium2-dev C++ API compatibility, and the trixie branch inupdate.shcan be reverted.🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@update.sh` around lines 99 - 100, Add a permanent, repo-local tracking issue for this temporary workaround and link it from the inline comment in update.sh so we don't forget to revert the trixie branch change later: create an issue in the repository (title like "Temporary: skip tools/osmium build for trixie due to libosmium2-dev C++ API incompatibility") that references upstream issue `#323` and the pr/commit, include expected revert criteria and an owner; then update the comment near the trixie/tools/osmium skip in update.sh to include the new local issue number/URL, a TODO tag (e.g. TODO: TEMP_WORKAROUND), and a target/review date or owner so the workaround can be tracked and removed when upstream is fixed.
99-103: Approach is correct; consider also removing the now-unusedlibosmium2-devinstall/purge for trixie.Applying the skip at generation time (rather than in
extra/Dockerfile.template) is the right call since bullseye (pg ≤ 17) still needs to buildtools/osmium. The sed range is well-anchored (cd ../tools/osmium/… first subsequentmake install), idempotent (a second run won't match^ \+\&\&on already-commented lines), and the linked tracking issue comment is helpful.One optional follow-up: since
tools/osmiumis no longer built on trixie,libosmium2-devis installed (line 15 of the generated Dockerfile) and then purged (line 41) for no reason. Not a correctness issue (same RUN layer, so no image bloat), but you could extend the trixie branch to also strip it for clarity.Optional: also drop libosmium2-dev on trixie
if [ "$suite" = "trixie" ]; then sed -i '/\&\& cd \.\.\/tools\/osmium\//,/\&\& make install/ s/^ \+\&\& /# \&\& /' "$version/extra/Dockerfile" + sed -i '/libosmium2-dev/d' "$version/extra/Dockerfile" fi🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@update.sh` around lines 99 - 103, The trixie branch currently comments out the tools/osmium build but leaves the libosmium2-dev install/purge steps in the generated Dockerfile; update the if [ "$suite" = "trixie" ] block (the same branch that runs the sed that comments out the osmium build) to also remove or comment the lines that install and purge libosmium2-dev in "$version/extra/Dockerfile" (match the install and purge commands by the literal string "libosmium2-dev" and either delete them or prefix them with "# " so the change is idempotent like the existing sed for the tools/osmium section).
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Nitpick comments:
In `@update.sh`:
- Around line 99-100: Add a permanent, repo-local tracking issue for this
temporary workaround and link it from the inline comment in update.sh so we
don't forget to revert the trixie branch change later: create an issue in the
repository (title like "Temporary: skip tools/osmium build for trixie due to
libosmium2-dev C++ API incompatibility") that references upstream issue `#323` and
the pr/commit, include expected revert criteria and an owner; then update the
comment near the trixie/tools/osmium skip in update.sh to include the new local
issue number/URL, a TODO tag (e.g. TODO: TEMP_WORKAROUND), and a target/review
date or owner so the workaround can be tracked and removed when upstream is
fixed.
- Around line 99-103: The trixie branch currently comments out the tools/osmium
build but leaves the libosmium2-dev install/purge steps in the generated
Dockerfile; update the if [ "$suite" = "trixie" ] block (the same branch that
runs the sed that comments out the osmium build) to also remove or comment the
lines that install and purge libosmium2-dev in "$version/extra/Dockerfile"
(match the install and purge commands by the literal string "libosmium2-dev" and
either delete them or prefix them with "# " so the change is idempotent like the
existing sed for the tools/osmium section).
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: c79e2f89-7d5f-4a65-acb7-6bf38f2c812b
📒 Files selected for processing (6)
18-3.6-3.7/extra/Dockerfile18-3.6-3.8/extra/Dockerfile18-3.6-4.0/extra/Dockerfile18-3.6-develop/extra/Dockerfile18-3.6-main/extra/Dockerfileupdate.sh
Fixes the regression introduced after #75 was merged.
Changes proposed in this pull request:
update.shto comment out thetools/osmiumbuild block whenthe target Debian suite is
trixie(pg18)18-3.6-{3.7,3.8,4.0,develop,main}/extra/Dockerfilewith the osmium build skipped
Background
PR #75 commit
9fe515amanually commented out thetools/osmiumbuildlines in each
18-3.6-*/extra/Dockerfileto work around thelibosmium2-devC++ API incompatibility on Trixie:However,
update.sh(andextra/Dockerfile.template) were not updatedat the same time. The subsequent nightly "Update hashes and versions" PRs
(#76, #78) ran
make update, which regenerated those files from theunchanged template — silently reverting the comments and causing all
18-3.6-*extra image builds to fail.This PR moves the osmium skip into
update.shitself, somake updateproduces the correct output and the fix survives future regenerations.
Summary by CodeRabbit