Skip to content

Commit 6f8f53a

Browse files
committed
CI: Debug readthedocs build, pin compiler version to avoid GCC 15+, which we haven't tested yet and doesn't seem to be working
1 parent 6da12ec commit 6f8f53a

3 files changed

Lines changed: 8 additions & 9 deletions

File tree

Dockerfile.dev

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:bookworm-slim AS builder
1+
FROM debian:trixie-slim AS builder
22

33
RUN apt-get update && \
44
apt-get install -y git build-essential cmake ninja-build openssh-client \
@@ -25,11 +25,11 @@ RUN pip install --break-system-packages \
2525

2626
# Install libxml2
2727
RUN cd /tmp && \
28-
wget https://gitlab.gnome.org/GNOME/libxml2/-/archive/v2.13.5/libxml2-v2.13.5.tar.gz && \
29-
echo "37cdec8cd20af8ab0decfa2419b09b4337c2dbe9da5615d2a26f547449fecf2a libxml2-v2.13.5.tar.gz" > libxml2.sum && \
28+
wget https://download.gnome.org/sources/libxml2/2.15/libxml2-2.15.1.tar.xz && \
29+
echo "c008bac08fd5c7b4a87f7b8a71f283fa581d80d80ff8d2efd3b26224c39bc54c libxml2-2.15.1.tar.xz" > libxml2.sum && \
3030
shasum -a 256 -c libxml2.sum && \
31-
tar xf libxml2-v2.13.5.tar.gz && \
32-
cd libxml2-v2.13.5 && \
31+
tar xf libxml2-2.15.1.tar.xz && \
32+
cd libxml2-2.15.1 && \
3333
cmake -B build -G Ninja -S . -DCMAKE_BUILD_TYPE:STRING=Debug -DCMAKE_INSTALL_PREFIX:PATH=/usr \
3434
-DLIBXML2_WITH_ZLIB=ON -DLIBXML2_WITH_ICONV=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_PYTHON=OFF && \
3535
cmake --build build --target install
@@ -73,8 +73,7 @@ RUN cd /tmp && \
7373
RUN ldconfig
7474

7575
# Create Python venv and install dependencies
76-
RUN python3 -m pip install --break-system-packages --upgrade pip && \
77-
python3 -m pip install --break-system-packages setuptools 'setuptools-scm[toml]' wheel cmake-build-extension \
76+
RUN python3 -m pip install --break-system-packages setuptools 'setuptools-scm[toml]' wheel cmake-build-extension \
7877
unittest-xml-reporting pytest pytest-cov pytest-xdist numpy && \
7978
# Install GDAL after numpy is installed so that gdal_array bindings will be installed.
8079
python3 -m pip install --break-system-packages 'GDAL==3.9.3'

docs/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ if(BAG_BUILD_PYTHON)
7171
${DOXYGEN_INDEX_FILE}
7272
MAIN_DEPENDENCY ${SPHINX_SOURCE}/conf.py
7373
COMMENT "Generating documentation with Sphinx")
74-
elseif()
74+
else()
7575
add_custom_command(OUTPUT ${SPHINX_INDEX_FILE}
7676
COMMAND
7777
${SPHINX_EXECUTABLE} -b html

docs/readthedocs/environment.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ channels:
33
- conda-forge
44
dependencies:
55
- python=3.13
6-
- gxx_linux-64
6+
- gxx_linux-64=14.3.0
77
- cmake
88
- ninja
99
- hdf5-static

0 commit comments

Comments
 (0)