Merge pull request #80 from sanak/fix-pg18-extra-osmium-build

Fix pg18 extra image CI failures by skipping tools/osmium build in update.sh

Author: sanak

18-3.6-3.7/extra/Dockerfile

@@ -24,12 +24,12 @@ RUN apt update \
  && cmake .. \
  && make \
  && make install \
- && cd ../tools/osmium/ \
- && mkdir build \
- && cd build \
- && cmake .. \
- && make \
- && make install \
+#  && cd ../tools/osmium/ \
+#  && mkdir build \
+#  && cd build \
+#  && cmake .. \
+#  && make \
+#  && make install \
  && cd /usr/local/src \
  && rm -rf ./* \
  && apt purge -y --autoremove \

18-3.6-3.8/extra/Dockerfile

@@ -24,12 +24,12 @@ RUN apt update \
  && cmake .. \
  && make \
  && make install \
- && cd ../tools/osmium/ \
- && mkdir build \
- && cd build \
- && cmake .. \
- && make \
- && make install \
+#  && cd ../tools/osmium/ \
+#  && mkdir build \
+#  && cd build \
+#  && cmake .. \
+#  && make \
+#  && make install \
  && cd /usr/local/src \
  && rm -rf ./* \
  && apt purge -y --autoremove \

18-3.6-4.0/extra/Dockerfile

@@ -24,12 +24,12 @@ RUN apt update \
  && cmake .. \
  && make \
  && make install \
- && cd ../tools/osmium/ \
- && mkdir build \
- && cd build \
- && cmake .. \
- && make \
- && make install \
+#  && cd ../tools/osmium/ \
+#  && mkdir build \
+#  && cd build \
+#  && cmake .. \
+#  && make \
+#  && make install \
  && cd /usr/local/src \
  && rm -rf ./* \
  && apt purge -y --autoremove \

18-3.6-develop/extra/Dockerfile

@@ -24,12 +24,12 @@ RUN apt update \
  && cmake .. \
  && make \
  && make install \
- && cd ../tools/osmium/ \
- && mkdir build \
- && cd build \
- && cmake .. \
- && make \
- && make install \
+#  && cd ../tools/osmium/ \
+#  && mkdir build \
+#  && cd build \
+#  && cmake .. \
+#  && make \
+#  && make install \
  && cd /usr/local/src \
  && rm -rf ./* \
  && apt purge -y --autoremove \

18-3.6-main/extra/Dockerfile

@@ -24,12 +24,12 @@ RUN apt update \
  && cmake .. \
  && make \
  && make install \
- && cd ../tools/osmium/ \
- && mkdir build \
- && cd build \
- && cmake .. \
- && make \
- && make install \
+#  && cd ../tools/osmium/ \
+#  && mkdir build \
+#  && cd build \
+#  && cmake .. \
+#  && make \
+#  && make install \
  && cd /usr/local/src \
  && rm -rf ./* \
  && apt purge -y --autoremove \

update.sh

@@ -96,6 +96,11 @@ for version in "${versions[@]}"; do
         sed -i 's/%%PG_MAJOR%%/'"$postgresVersion"'/g; s/%%POSTGIS_VERSION%%/'"$postgisVersion"'/g; s/%%PGROUTING_VERSION%%/'"$pgroutingVersion"'/g;' "$version/docker-compose.yml"
         mv "$version/extra/Dockerfile.template" "$version/extra/Dockerfile"
         sed -i 's/%%PG_MAJOR%%/'"$postgresVersion"'/g; s/%%POSTGIS_VERSION%%/'"$postgisVersion"'/g; s/%%PGROUTING_VERSION%%/'"$pgroutingVersion"'/g; s/%%PQXX_VERSION%%/'"$pqxxVersion"'/g;' "$version/extra/Dockerfile"
+        # libosmium2-dev on Trixie has incompatible C++ API changes; skip tools/osmium build temporarily
+        # See: https://github.com/pgRouting/osm2pgrouting/issues/323
+        if [ "$suite" = "trixie" ]; then
+            sed -i '/\&\& cd \.\.\/tools\/osmium\//,/\&\& make install/ s/^ \+\&\& /#  \&\& /' "$version/extra/Dockerfile"
+        fi
         echo "$postgresVersion-$postgisVersion-$pgroutingVersion" > "$version/version.txt"
     )
 done