Skip to content

Commit b7b589e

Browse files
authored
Issue 684: add documention and tests for debian 13 (#685)
* switch debian12 to debian13 * fix condition
1 parent 10a5719 commit b7b589e

File tree

3 files changed

+32
-9
lines changed

3 files changed

+32
-9
lines changed

.github/workflows/cmake-build.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ jobs:
252252
dpkg:
253253
strategy:
254254
matrix:
255-
os: [debian12, debian11]
255+
os: [debian13, debian11]
256256
shared: [shared, static]
257257
boost: [boost, stdfs]
258258
mpi: [
@@ -285,14 +285,21 @@ jobs:
285285
run: |
286286
docker exec --user root build /bin/bash -c "apt-get update && apt-get -y install --no-install-recommends build-essential libhdf5-dev libhdf5-mpi-dev libopenmpi-dev"
287287
- name: Create Config
288+
if: ${{ matrix.os == 'debian13' }}
289+
run: |
290+
docker exec --user root build /bin/bash -c "chown -R p00user /home/p00user/src"
291+
docker exec build /bin/bash -c "HDF5_STATIC=ON; [ \"${H5CPP_SHARED}\" = \"True\" ] && HDF5_STATIC=OFF; git config --global --add safe.directory /home/p00user/src && mkdir ../build && cd ../build &&
292+
cmake ../src -DCMAKE_BUILD_TYPE=Release -DH5CPP_CONAN=DISABLE -DHDF5_USE_STATIC_LIBRARIES=${HDF5_STATIC} -DH5CPP_BUILD_SHARED=${H5CPP_SHARED} -DH5CPP_WITH_BOOST=${H5CPP_WITH_BOOST} -DH5CPP_WITH_MPI=${H5CPP_WITH_MPI}"
293+
- name: Create Config (cache2 v2)
294+
if: ${{ matrix.os == 'debian11' }}
288295
run: |
289296
docker exec --user root build /bin/bash -c "chown -R p00user /home/p00user/src"
290297
docker exec build /bin/bash -c "HDF5_STATIC=ON; [ \"${H5CPP_SHARED}\" = \"True\" ] && HDF5_STATIC=OFF; git config --global --add safe.directory /home/p00user/src && mkdir ../build && cd ../build &&
291298
cmake ../src -DCMAKE_BUILD_TYPE=Release -DH5CPP_CONAN=DISABLE -DH5CPP_CATCH2_V2=TRUE -DHDF5_USE_STATIC_LIBRARIES=${HDF5_STATIC} -DH5CPP_BUILD_SHARED=${H5CPP_SHARED} -DH5CPP_WITH_BOOST=${H5CPP_WITH_BOOST} -DH5CPP_WITH_MPI=${H5CPP_WITH_MPI}"
292299
- name: Build all
293300
run: docker exec build /bin/bash -c "cd ../build && cmake --build . -- -j 2"
294301
- name: Build html
295-
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/docs_')) && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian12'
302+
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/docs_')) && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian13'
296303
run: docker exec build /bin/bash -c "cd ../build && cmake --build . --target html"
297304
- name: Run tests
298305
run: docker exec build /bin/bash -c "cd ../build && ctest --extra-verbose --no-tests=error"
@@ -301,7 +308,7 @@ jobs:
301308
- name: Build examples
302309
run: docker exec build /bin/bash -c "mkdir ../examples_build && cd ../examples_build && cmake ../src/examples -DCMAKE_BUILD_TYPE=Release && cmake --build . -- -j 2 "
303310
- name: Append documentation for the latest release version
304-
if: startsWith(github.ref, 'refs/heads/master') && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian12'
311+
if: startsWith(github.ref, 'refs/heads/master') && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian13'
305312
run: |
306313
docker exec --user root build /bin/bash -c "chown -R p00user /home/p00user/src"
307314
docker exec build /bin/bash -c "git config --unset-all remote.origin.fetch"
@@ -318,14 +325,14 @@ jobs:
318325
docker exec build /bin/bash -c "rm -rf ./src"
319326
320327
- name: Extract the code version from the branch name
321-
if: startsWith(github.ref, 'refs/heads/docs_') && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian12'
328+
if: startsWith(github.ref, 'refs/heads/docs_') && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian13'
322329
shell: bash
323330
run: echo "docver=$(echo ${GITHUB_REF#refs/heads/docs_})" >> $GITHUB_OUTPUT
324331
# run: echo "##[set-output name=docver;]$(echo ${GITHUB_REF#refs/heads/docs_})"
325332
id: extract_docver
326333

327334
- name: Append documentation for the extracted release version
328-
if: startsWith(github.ref, 'refs/heads/docs_') && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian12'
335+
if: startsWith(github.ref, 'refs/heads/docs_') && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian13'
329336
run: |
330337
echo Version: ${{ steps.extract_docver.outputs.docver }}
331338
docker exec --user root build /bin/bash -c "chown -R p00user /home/p00user/src"
@@ -344,7 +351,7 @@ jobs:
344351
docker exec build /bin/bash -c "rm -rf ./src"
345352
346353
- name: Deploy documentation
347-
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/docs_')) && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian12'
354+
if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/docs_')) && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian13'
348355
uses: s0/git-publish-subdir-action@develop
349356
env:
350357
REPO: self

.github/workflows/debian13/Dockerfile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM debian:trixie
2+
3+
RUN apt-get update
4+
RUN apt-get install -y base-passwd apt-utils dialog -y
5+
RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
6+
RUN apt-get -qq update && apt-get -qq install -y libterm-readline-gnu-perl coreutils gnupg2 procps curl apt-transport-https gnupg2 ca-certificates wget
7+
RUN apt-get -qq update && apt-get -qq -y dist-upgrade
8+
RUN apt-get -qq update && apt-get -y install cmake g++ doxygen python3-sphinx git graphviz texlive doxygen pkg-config texlive-latex-extra texlive-latex-recommended texlive-pictures python3-pygments lsb-release python3-breathe texlive-pictures python3-sphinx-rtd-theme libjs-mathjax fonts-mathjax fonts-mathjax-extras ghostscript cmake catch2 libboost-filesystem-dev
9+
10+
RUN apt-get clean
11+
12+
# add p00user
13+
RUN useradd -rm -d /home/p00user -s /bin/bash p00user
14+
USER p00user
15+
RUN mkdir -p /home/p00user/src
16+
WORKDIR /home/p00user/src

doc/source/users_guide/installing.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,19 +123,19 @@ keyring
123123
The return value of this command line should be `OK`.
124124
In a next step you have to add new package sources to your system. For this
125125
purpose go to :file:`/etc/apt/sources.list.d` and download the sources file.
126-
For Debian (Bookworm) use
126+
For Debian (Trixie) use
127127

128128
.. code-block:: bash
129129
130-
$ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
130+
$ wget http://repos.pni-hdri.de/trixie-pni-hdri.list
131131
132132
and for Ubuntu (Noble)
133133

134134
.. code-block:: bash
135135
136136
$ wget http://repos.pni-hdri.de/noble-pni-hdri.list
137137
138-
Similarly, proceed for Bullseye, Buster, Plucky, Jammy.
138+
Similarly, proceed for Bookworm, Bullseye, Buster, Plucky, Jammy.
139139
Once you have downloaded the file use
140140

141141
.. code-block:: bash

0 commit comments

Comments
 (0)