Skip to content

Commit 5589856

Browse files
authored
Issue 653: update documention for installing h5cpp from debian and ubuntu packages (#654)
* update documention for installing h5cpp from debian and ubuntu packages * update ubuntu conan tests * add profiles back
1 parent 9486a26 commit 5589856

File tree

5 files changed

+23
-29
lines changed

5 files changed

+23
-29
lines changed

.github/workflows/cmake-build.yml

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,42 +22,32 @@ jobs:
2222
# mpi,
2323
serial
2424
]
25-
libcxx: [libstdc++11, libc++]
26-
image: [
27-
"conanio/gcc11-ubuntu16.04:2.0.2",
28-
"conanio/clang13-ubuntu16.04:2.0.2"
25+
profile: [
26+
gcc11,
27+
clang14-libc++,
28+
clang14-libstdc++
2929
]
30-
exclude:
31-
- image: conanio/gcc11-ubuntu16.04:2.0.2
32-
libcxx: libc++
33-
include:
34-
- image: conanio/gcc11-ubuntu16.04:2.0.2
35-
profile: gcc11
36-
- image: conanio/clang13-ubuntu16.04:2.0.2
37-
libcxx: libstdc++11
38-
profile: clang13-libstdc++
39-
- image: conanio/clang13-ubuntu16.04:2.0.2
40-
libcxx: libc++
41-
profile: clang13-libc++
42-
runs-on: ubuntu-20.04
43-
container:
44-
image: ${{ matrix.image }}
45-
options: '--user=root'
30+
runs-on: ubuntu-22.04
31+
# container:
32+
# image: ${{ matrix.image }}
33+
# options: '--user=root'
4634
steps:
4735
- uses: actions/checkout@v2
4836
- name: Set environment variables
4937
run: |
5038
bash .github/workflows/set_env_vars.sh \
5139
${{ matrix.shared }} \
5240
${{ matrix.boost }} \
53-
${{ matrix.mpi }}
41+
${{ matrix.mpi }} \
42+
${{ matrix.profile }}
5443
- name: Install MPI prerequisites
5544
if: ${{ matrix.mpi == 'mpi' }}
5645
run: |
5746
apt-get update
5847
apt-get install -y --no-install-recommends ssh
5948
- name: Install and configure conan
6049
run: |
50+
pip install --upgrade conan==2.0.2
6151
CONAN_ARGS="--profile .github/workflows/conan/profiles/${{ matrix.profile }} \
6252
-o with_boost=${H5CPP_WITH_BOOST} \
6353
-o with_mpi=${H5CPP_WITH_MPI} \
@@ -70,7 +60,7 @@ jobs:
7060
- name: cache conan dependencies
7161
uses: actions/cache@v2
7262
with:
73-
path: /home/conan/.conan/data
63+
path: ~/.conan/data
7464
key: conan-${{ matrix.profile }}-${{ hashfiles('base.lock') }}-${{ hashFiles('conan.lock') }}
7565
restore-keys: |
7666
conan-${{ matrix.profile }}-${{ hashfiles('base.lock') }}

.github/workflows/conan/profiles/clang13-libc++ renamed to .github/workflows/conan/profiles/clang14-libc++

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ arch=x86_64
33
build_type=Release
44
compiler=clang
55
compiler.libcxx=libc++
6-
compiler.version=13
6+
compiler.version=14
77
os=Linux

.github/workflows/conan/profiles/clang13-libstdc++ renamed to .github/workflows/conan/profiles/clang14-libstdc++

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ arch=x86_64
33
build_type=Release
44
compiler=clang
55
compiler.libcxx=libstdc++11
6-
compiler.version=13
6+
compiler.version=14
77
os=Linux

.github/workflows/set_env_vars.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@ if [ "$3" = "mpi" ]; then
1414
else
1515
echo "H5CPP_WITH_MPI=False" >> $GITHUB_ENV
1616
fi
17+
if [ "$4" = "clang14-libc++" ] || [ "$4" = "clang14-libstdc++" ] ; then
18+
echo "CC=clang" >> $GITHUB_ENV
19+
echo "CXX=clang++" >> $GITHUB_ENV
20+
fi

doc/source/users_guide/installing.rst

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

127127
.. code-block:: bash
128128
129-
$ wget http://repos.pni-hdri.de/buster-pni-hdri.list
129+
$ wget http://repos.pni-hdri.de/bookworm-pni-hdri.list
130130
131-
and for Ubuntu (Focal)
131+
and for Ubuntu (Noble)
132132

133133
.. code-block:: bash
134134
135-
$ wget http://repos.pni-hdri.de/focal-pni-hdri.list
135+
$ wget http://repos.pni-hdri.de/noble-pni-hdri.list
136136
137-
Similarly, proceed for Bullseye, Buster, Lunar, Jammy, Focal.
137+
Similarly, proceed for Bullseye, Buster, Oracular, Jammy.
138138
Once you have downloaded the file use
139139

140140
.. code-block:: bash

0 commit comments

Comments
 (0)