mirror of
https://github.com/qgis/QGIS.git
synced 2025-10-04 00:04:03 -04:00
Drop pdal from ubuntu CI
This requires compilation of PDAL (since it's not available in the Ubuntu repos), which takes a LONG time and adds substantially to the CI run time. We retain test coverage via the Fedora builds.
This commit is contained in:
parent
80e73555e4
commit
fb03531d25
@ -105,7 +105,7 @@ cmake \
|
|||||||
-DWITH_SERVER=ON \
|
-DWITH_SERVER=ON \
|
||||||
-DWITH_SERVER_LANDINGPAGE_WEBAPP=${WITH_SERVER_LANDINGPAGE_WEBAPP} \
|
-DWITH_SERVER_LANDINGPAGE_WEBAPP=${WITH_SERVER_LANDINGPAGE_WEBAPP} \
|
||||||
-DWITH_ORACLE=ON \
|
-DWITH_ORACLE=ON \
|
||||||
-DWITH_PDAL=ON \
|
-DWITH_PDAL=${WITH_PDAL} \
|
||||||
-DWITH_QTSERIALPORT=ON \
|
-DWITH_QTSERIALPORT=ON \
|
||||||
-DWITH_PDF4QT=${WITH_PDF4QT} \
|
-DWITH_PDF4QT=${WITH_PDF4QT} \
|
||||||
-DWITH_SFCGAL=${WITH_SFCGAL} \
|
-DWITH_SFCGAL=${WITH_SFCGAL} \
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
|
|
||||||
ARG DISTRO_VERSION=25.04
|
ARG DISTRO_VERSION=25.04
|
||||||
ARG PDAL_VERSION=2.8.4
|
|
||||||
|
|
||||||
# Oracle Docker image is too large, so we add as less dependencies as possible
|
# Oracle Docker image is too large, so we add as less dependencies as possible
|
||||||
# so there is enough space on GitHub runner
|
# so there is enough space on GitHub runner
|
||||||
@ -9,8 +8,6 @@ LABEL org.opencontainers.image.authors="Denis Rouzaud <denis@opengis.ch>"
|
|||||||
|
|
||||||
LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
|
LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
|
||||||
|
|
||||||
ARG PDAL_VERSION
|
|
||||||
|
|
||||||
# && echo "deb http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
|
# && echo "deb http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
|
||||||
# && echo "deb-src http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
|
# && echo "deb-src http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
|
||||||
# && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 314DF160 \
|
# && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 314DF160 \
|
||||||
@ -141,24 +138,11 @@ RUN locale-gen
|
|||||||
|
|
||||||
RUN echo "alias python=python3" >> ~/.bash_aliases
|
RUN echo "alias python=python3" >> ~/.bash_aliases
|
||||||
|
|
||||||
# PDAL is not available in ubuntu 24.04
|
|
||||||
# Install it from source
|
|
||||||
# PDAL dependencies
|
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
&& DEBIAN_FRONTEND=noninteractive apt-get install -y \
|
||||||
ninja-build \
|
ninja-build \
|
||||||
libgdal-dev \
|
libgdal-dev \
|
||||||
libproj-dev
|
libproj-dev
|
||||||
# download PDAL and compile it
|
|
||||||
RUN curl -L https://github.com/PDAL/PDAL/releases/download/${PDAL_VERSION}/PDAL-${PDAL_VERSION}-src.tar.gz --output PDAL-${PDAL_VERSION}-src.tar.gz \
|
|
||||||
&& mkdir pdal \
|
|
||||||
&& tar zxf PDAL-${PDAL_VERSION}-src.tar.gz -C pdal --strip-components=1 \
|
|
||||||
&& rm -f PDAL-${PDAL_VERSION}-src.tar.gz \
|
|
||||||
&& mkdir -p pdal/build \
|
|
||||||
&& cd pdal/build \
|
|
||||||
&& cmake -GNinja -DCMAKE_INSTALL_PREFIX=/usr/local -DWITH_TESTS=OFF .. \
|
|
||||||
&& ninja \
|
|
||||||
&& ninja install
|
|
||||||
|
|
||||||
# download spatialindex and compile it
|
# download spatialindex and compile it
|
||||||
RUN curl -L https://github.com/libspatialindex/libspatialindex/releases/download/2.0.0/spatialindex-src-2.0.0.tar.gz --output spatialindex-src-2.0.0.tar.gz \
|
RUN curl -L https://github.com/libspatialindex/libspatialindex/releases/download/2.0.0/spatialindex-src-2.0.0.tar.gz --output spatialindex-src-2.0.0.tar.gz \
|
||||||
|
3
.github/workflows/run-tests.yml
vendored
3
.github/workflows/run-tests.yml
vendored
@ -52,6 +52,7 @@ jobs:
|
|||||||
with-grass7: OFF
|
with-grass7: OFF
|
||||||
with-grass8: OFF
|
with-grass8: OFF
|
||||||
with-pdf4qt: OFF
|
with-pdf4qt: OFF
|
||||||
|
with-pdal: OFF
|
||||||
with-sfcgal: ON
|
with-sfcgal: ON
|
||||||
with-compile-commands: ON
|
with-compile-commands: ON
|
||||||
with-model-test: ON
|
with-model-test: ON
|
||||||
@ -74,6 +75,7 @@ jobs:
|
|||||||
with-clazy: OFF
|
with-clazy: OFF
|
||||||
with-grass7: OFF
|
with-grass7: OFF
|
||||||
with-grass8: ON
|
with-grass8: ON
|
||||||
|
with-pdal: ON
|
||||||
with-pdf4qt: ON
|
with-pdf4qt: ON
|
||||||
with-sfcgal: ON
|
with-sfcgal: ON
|
||||||
with-compile-commands: OFF
|
with-compile-commands: OFF
|
||||||
@ -172,6 +174,7 @@ jobs:
|
|||||||
--env WITH_GRASS7=${{ matrix.with-grass7 }} \
|
--env WITH_GRASS7=${{ matrix.with-grass7 }} \
|
||||||
--env WITH_GRASS8=${{ matrix.with-grass8 }} \
|
--env WITH_GRASS8=${{ matrix.with-grass8 }} \
|
||||||
--env WITH_PDF4QT=${{ matrix.with-pdf4qt }} \
|
--env WITH_PDF4QT=${{ matrix.with-pdf4qt }} \
|
||||||
|
--env WITH_PDAL=${{ matrix.with-pdal }} \
|
||||||
--env LD_PRELOAD=${{ matrix.LD_PRELOAD }} \
|
--env LD_PRELOAD=${{ matrix.LD_PRELOAD }} \
|
||||||
--env WITH_CLAZY=${{ matrix.with-clazy }} \
|
--env WITH_CLAZY=${{ matrix.with-clazy }} \
|
||||||
--env WITH_SFCGAL=${{ matrix.with-sfcgal }} \
|
--env WITH_SFCGAL=${{ matrix.with-sfcgal }} \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user