diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml index b13290fd56..45ce1755c5 100644 --- a/.github/workflows/cmake-build.yml +++ b/.github/workflows/cmake-build.yml @@ -22,27 +22,15 @@ 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 @@ -50,7 +38,8 @@ jobs: 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: | @@ -58,6 +47,7 @@ jobs: 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} \ @@ -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') }} diff --git a/.github/workflows/conan/profiles/clang13-libc++ b/.github/workflows/conan/profiles/clang14-libc++ similarity index 81% rename from .github/workflows/conan/profiles/clang13-libc++ rename to .github/workflows/conan/profiles/clang14-libc++ index ff183ebac5..3fef9c68b4 100644 --- a/.github/workflows/conan/profiles/clang13-libc++ +++ b/.github/workflows/conan/profiles/clang14-libc++ @@ -3,5 +3,5 @@ arch=x86_64 build_type=Release compiler=clang compiler.libcxx=libc++ -compiler.version=13 +compiler.version=14 os=Linux diff --git a/.github/workflows/conan/profiles/clang13-libstdc++ b/.github/workflows/conan/profiles/clang14-libstdc++ similarity index 82% rename from .github/workflows/conan/profiles/clang13-libstdc++ rename to .github/workflows/conan/profiles/clang14-libstdc++ index 82e974c588..2c02f077c3 100644 --- a/.github/workflows/conan/profiles/clang13-libstdc++ +++ b/.github/workflows/conan/profiles/clang14-libstdc++ @@ -3,5 +3,5 @@ arch=x86_64 build_type=Release compiler=clang compiler.libcxx=libstdc++11 -compiler.version=13 +compiler.version=14 os=Linux diff --git a/.github/workflows/set_env_vars.sh b/.github/workflows/set_env_vars.sh index f239d47c93..a894782995 100644 --- a/.github/workflows/set_env_vars.sh +++ b/.github/workflows/set_env_vars.sh @@ -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 diff --git a/doc/source/users_guide/installing.rst b/doc/source/users_guide/installing.rst index 72a718987a..e5115c7b9e 100644 --- a/doc/source/users_guide/installing.rst +++ b/doc/source/users_guide/installing.rst @@ -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