Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 12 additions & 22 deletions .github/workflows/cmake-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,42 +22,32 @@ jobs:
# mpi,
serial
]
libcxx: [libstdc++11, libc++]
image: [
"conanio/gcc11-ubuntu16.04:2.0.2",
"conanio/clang13-ubuntu16.04:2.0.2"
profile: [
gcc11,
clang14-libc++,
clang14-libstdc++
]
exclude:
- image: conanio/gcc11-ubuntu16.04:2.0.2
libcxx: libc++
include:
- image: conanio/gcc11-ubuntu16.04:2.0.2
profile: gcc11
- image: conanio/clang13-ubuntu16.04:2.0.2
libcxx: libstdc++11
profile: clang13-libstdc++
- image: conanio/clang13-ubuntu16.04:2.0.2
libcxx: libc++
profile: clang13-libc++
runs-on: ubuntu-20.04
container:
image: ${{ matrix.image }}
options: '--user=root'
runs-on: ubuntu-22.04
# container:
# image: ${{ matrix.image }}
# options: '--user=root'
steps:
- uses: actions/checkout@v2
- name: Set environment variables
run: |
bash .github/workflows/set_env_vars.sh \
${{ matrix.shared }} \
${{ matrix.boost }} \
${{ matrix.mpi }}
${{ matrix.mpi }} \
${{ matrix.profile }}
- name: Install MPI prerequisites
if: ${{ matrix.mpi == 'mpi' }}
run: |
apt-get update
apt-get install -y --no-install-recommends ssh
- name: Install and configure conan
run: |
pip install --upgrade conan==2.0.2
CONAN_ARGS="--profile .github/workflows/conan/profiles/${{ matrix.profile }} \
-o with_boost=${H5CPP_WITH_BOOST} \
-o with_mpi=${H5CPP_WITH_MPI} \
Expand All @@ -70,7 +60,7 @@ jobs:
- name: cache conan dependencies
uses: actions/cache@v2
with:
path: /home/conan/.conan/data
path: ~/.conan/data
key: conan-${{ matrix.profile }}-${{ hashfiles('base.lock') }}-${{ hashFiles('conan.lock') }}
restore-keys: |
conan-${{ matrix.profile }}-${{ hashfiles('base.lock') }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ arch=x86_64
build_type=Release
compiler=clang
compiler.libcxx=libc++
compiler.version=13
compiler.version=14
os=Linux
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ arch=x86_64
build_type=Release
compiler=clang
compiler.libcxx=libstdc++11
compiler.version=13
compiler.version=14
os=Linux
4 changes: 4 additions & 0 deletions .github/workflows/set_env_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,7 @@ if [ "$3" = "mpi" ]; then
else
echo "H5CPP_WITH_MPI=False" >> $GITHUB_ENV
fi
if [ "$4" = "clang14-libc++" ] || [ "$4" = "clang14-libstdc++" ] ; then
echo "CC=clang" >> $GITHUB_ENV
echo "CXX=clang++" >> $GITHUB_ENV
fi
10 changes: 5 additions & 5 deletions doc/source/users_guide/installing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -122,19 +122,19 @@ 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 (Buster) use
For Debian (Bookworm) use

.. code-block:: bash

$ wget http://repos.pni-hdri.de/buster-pni-hdri.list
$ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list

and for Ubuntu (Focal)
and for Ubuntu (Noble)

.. code-block:: bash

$ wget http://repos.pni-hdri.de/focal-pni-hdri.list
$ wget http://repos.pni-hdri.de/noble-pni-hdri.list

Similarly, proceed for Bullseye, Buster, Lunar, Jammy, Focal.
Similarly, proceed for Bullseye, Buster, Oracular, Jammy.
Once you have downloaded the file use

.. code-block:: bash
Expand Down
Loading