diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml index bbae98758..40162b4f1 100644 --- a/.github/workflows/cmake-build.yml +++ b/.github/workflows/cmake-build.yml @@ -252,7 +252,7 @@ jobs: dpkg: strategy: matrix: - os: [debian12, debian11] + os: [debian13, debian11] shared: [shared, static] boost: [boost, stdfs] mpi: [ @@ -285,6 +285,13 @@ jobs: run: | 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" - name: Create Config + if: ${{ matrix.os == 'debian13' }} + run: | + docker exec --user root build /bin/bash -c "chown -R p00user /home/p00user/src" + 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 && + 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}" + - name: Create Config (cache2 v2) + if: ${{ matrix.os == 'debian11' }} run: | docker exec --user root build /bin/bash -c "chown -R p00user /home/p00user/src" 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,7 +299,7 @@ jobs: - name: Build all run: docker exec build /bin/bash -c "cd ../build && cmake --build . -- -j 2" - name: Build html - if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/docs_')) && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian12' + if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/docs_')) && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian13' run: docker exec build /bin/bash -c "cd ../build && cmake --build . --target html" - name: Run tests run: docker exec build /bin/bash -c "cd ../build && ctest --extra-verbose --no-tests=error" @@ -301,7 +308,7 @@ jobs: - name: Build examples run: docker exec build /bin/bash -c "mkdir ../examples_build && cd ../examples_build && cmake ../src/examples -DCMAKE_BUILD_TYPE=Release && cmake --build . -- -j 2 " - name: Append documentation for the latest release version - if: startsWith(github.ref, 'refs/heads/master') && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian12' + if: startsWith(github.ref, 'refs/heads/master') && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian13' run: | docker exec --user root build /bin/bash -c "chown -R p00user /home/p00user/src" docker exec build /bin/bash -c "git config --unset-all remote.origin.fetch" @@ -318,14 +325,14 @@ jobs: docker exec build /bin/bash -c "rm -rf ./src" - name: Extract the code version from the branch name - if: startsWith(github.ref, 'refs/heads/docs_') && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian12' + if: startsWith(github.ref, 'refs/heads/docs_') && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian13' shell: bash run: echo "docver=$(echo ${GITHUB_REF#refs/heads/docs_})" >> $GITHUB_OUTPUT # run: echo "##[set-output name=docver;]$(echo ${GITHUB_REF#refs/heads/docs_})" id: extract_docver - name: Append documentation for the extracted release version - if: startsWith(github.ref, 'refs/heads/docs_') && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian12' + if: startsWith(github.ref, 'refs/heads/docs_') && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian13' run: | echo Version: ${{ steps.extract_docver.outputs.docver }} docker exec --user root build /bin/bash -c "chown -R p00user /home/p00user/src" @@ -344,7 +351,7 @@ jobs: docker exec build /bin/bash -c "rm -rf ./src" - name: Deploy documentation - if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/docs_')) && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian12' + if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/docs_')) && matrix.shared == 'shared' && matrix.boost == 'stdfs' && matrix.mpi == 'serial' && matrix.os == 'debian13' uses: s0/git-publish-subdir-action@develop env: REPO: self diff --git a/.github/workflows/debian13/Dockerfile b/.github/workflows/debian13/Dockerfile new file mode 100644 index 000000000..9d8f22261 --- /dev/null +++ b/.github/workflows/debian13/Dockerfile @@ -0,0 +1,16 @@ +FROM debian:trixie + +RUN apt-get update +RUN apt-get install -y base-passwd apt-utils dialog -y +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections +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 +RUN apt-get -qq update && apt-get -qq -y dist-upgrade +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 + +RUN apt-get clean + +# add p00user +RUN useradd -rm -d /home/p00user -s /bin/bash p00user +USER p00user +RUN mkdir -p /home/p00user/src +WORKDIR /home/p00user/src diff --git a/doc/source/users_guide/installing.rst b/doc/source/users_guide/installing.rst index ebfdf8d15..d0b0d8564 100644 --- a/doc/source/users_guide/installing.rst +++ b/doc/source/users_guide/installing.rst @@ -123,11 +123,11 @@ keyring The return value of this command line should be `OK`. In a next step you have to add new package sources to your system. For this purpose go to :file:`/etc/apt/sources.list.d` and download the sources file. -For Debian (Bookworm) use +For Debian (Trixie) use .. code-block:: bash - $ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list + $ wget http://repos.pni-hdri.de/trixie-pni-hdri.list and for Ubuntu (Noble) @@ -135,7 +135,7 @@ and for Ubuntu (Noble) $ wget http://repos.pni-hdri.de/noble-pni-hdri.list -Similarly, proceed for Bullseye, Buster, Plucky, Jammy. +Similarly, proceed for Bookworm, Bullseye, Buster, Plucky, Jammy. Once you have downloaded the file use .. code-block:: bash