From f9e270b6804f97a6aa4f050cf7bc795a69c48599 Mon Sep 17 00:00:00 2001 From: Blottiere Paul Date: Tue, 17 Jun 2025 22:14:00 +0200 Subject: [PATCH] Explicitly set LazPerf version to v1.5 to add support in the Docker image and fix the CI (some work is needed to upgrade to a newer version) --- docker/Dockerfile | 6 ++++-- tools/build_install.sh | 2 +- tools/install_lazperf.sh | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 85e857a5..9db8ac3a 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,6 +3,7 @@ MAINTAINER Paul Blottiere ENV POSTGRES_VERSION 14 ENV POSTGIS_VERSION 3 +ENV LAZPERF_VERSION 1.5.0 RUN apt-get update \ && apt-get install -y --no-install-recommends \ @@ -22,9 +23,10 @@ RUN apt-get update \ postgresql-server-dev-all \ libxml2-dev \ && rm -rf /var/lib/apt/lists/* \ - && git clone https://github.com/verma/laz-perf.git \ + && git clone https://github.com/hobuinc/laz-perf.git \ && cd laz-perf \ - && cmake . \ + && git checkout ${LAZPERF_VERSION} \ + && cmake -DWITH_TESTS=FALSE . \ && make \ && make install \ && cd .. \ diff --git a/tools/build_install.sh b/tools/build_install.sh index 485b44b5..8b00fb20 100644 --- a/tools/build_install.sh +++ b/tools/build_install.sh @@ -2,7 +2,7 @@ set -e -if [[ -f config.mk ]]; then +if [ -f config.mk ]; then make clean maintainer-clean fi diff --git a/tools/install_lazperf.sh b/tools/install_lazperf.sh index 9646861a..aaaeefee 100644 --- a/tools/install_lazperf.sh +++ b/tools/install_lazperf.sh @@ -1,4 +1,4 @@ #!/bin/sh set -ex -git clone https://github.com/verma/laz-perf.git -cd laz-perf; cmake .; make; sudo make install +git clone https://github.com/hobuinc/laz-perf.git +cd laz-perf; git checkout 1.5.0; cmake -DWITH_TESTS=FALSE .; make; sudo make install