Fix pg18 CI failures: skip tools/osmium build for trixie in update.sh#4
Open
sanak wants to merge 2 commits into
Open
Fix pg18 CI failures: skip tools/osmium build for trixie in update.sh#4sanak wants to merge 2 commits into
sanak wants to merge 2 commits into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
All
18-3.6-*extra image builds have been failing since PR pgRouting#75 was merged.The root cause is a missing template-level fix. PR pgRouting#75 commit
9fe515amanually commented out the
tools/osmiumbuild lines in each18-3.6-*/extra/Dockerfile, but did not updateupdate.sh(orextra/Dockerfile.template). As a result, the subsequent nightly"Update hashes and versions" PR (pgRouting#76) ran
make update, whichregenerated those files from the unchanged template — silently reverting
the comments and re-introducing the build failure.
The underlying incompatibility:
libosmium2-devon Debian Trixie (usedby pg18 images) has C++ API changes that break the
tools/osmiumbuildin osm2pgrouting 3.0.0.
See: pgRouting/osm2pgrouting#323
Fix
Add a post-generation step in
update.shthat comments out thetools/osmiumbuild block whenever the target Debian suite istrixie.This ensures
make updateproduces the correct output and the fixsurvives future hash-update regenerations.
Also re-apply the comment-out to the five currently broken generated
files (
18-3.6-{3.7,3.8,4.0,develop,main}/extra/Dockerfile).Changes
update.sh: after renderingextra/Dockerfile, comment out thetools/osmiumbuild block when$suite = "trixie"18-3.6-{3.7,3.8,4.0,develop,main}/extra/Dockerfile: re-generatedwith the osmium build skipped