Skip to content

Commit

Permalink
ci+docs: support CentOS Stream 9, drop CentOS 8
Browse files Browse the repository at this point in the history
Refs: #5181
Change-Id: I1d1a0ed02736ef5ec0c28d51f1c4f56f6e00d129
  • Loading branch information
Pesa committed Jul 4, 2022
1 parent 80d671f commit fbca611
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .jenkins.d/00-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ elif has Ubuntu $NODE_LABELS; then
;;
esac

elif has CentOS-8 $NODE_LABELS; then
elif has CentOS $NODE_LABELS; then
sudo dnf -y install gcc-c++ libasan pkgconf-pkg-config python3 \
boost-devel openssl-devel sqlite-devel
fi
5 changes: 2 additions & 3 deletions .jenkins.d/10-build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ fi
if [[ $JOB_NAME == *"code-coverage" ]]; then
COVERAGE="--with-coverage"
fi
if has CentOS-8 $NODE_LABELS; then
# https://bugzilla.redhat.com/show_bug.cgi?id=1721553
if [[ -n $DISABLE_PCH ]]; then
PCH="--without-pch"
fi

Expand Down Expand Up @@ -40,7 +39,7 @@ fi
# Install
sudo_preserve_env PATH -- ./waf --color=yes install

if has CentOS-8 $NODE_LABELS; then
if has CentOS $NODE_LABELS; then
sudo tee /etc/ld.so.conf.d/ndn.conf >/dev/null <<< /usr/local/lib64
fi
if has Linux $NODE_LABELS; then
Expand Down
2 changes: 0 additions & 2 deletions .jenkins.d/20-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ if has OSX $NODE_LABELS; then
security unlock-keychain -p named-data
fi

ndnsec key-gen "/tmp/jenkins/$NODE_NAME" | ndnsec cert-install -

# https://github.com/google/sanitizers/wiki/AddressSanitizerFlags
ASAN_OPTIONS="color=always"
ASAN_OPTIONS+=":check_initialization_order=1"
Expand Down
2 changes: 1 addition & 1 deletion .jenkins.d/40-headers-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [[ -n $DISABLE_HEADERS_CHECK ]]; then
exit 0
fi

if has CentOS-8 $NODE_LABELS; then
if has CentOS $NODE_LABELS; then
export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig
fi

Expand Down
19 changes: 9 additions & 10 deletions docs/INSTALL.rst
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ following platforms:
- Ubuntu 18.04 (amd64, armhf, i386)
- Ubuntu 20.04 (amd64)
- Ubuntu 21.10 (amd64)
- CentOS Stream 9
- macOS 10.15
- macOS 11 (Intel only)
- CentOS 8

ndn-cxx is known to work on the following platforms, although they are not officially
supported:
Expand Down Expand Up @@ -109,7 +109,6 @@ The following lists the steps to install these prerequisites on various common p

.. code-block:: sh
sudo dnf config-manager --enable powertools # on CentOS only
sudo dnf install doxygen graphviz python3-pip
pip3 install --user sphinx sphinxcontrib-doxylink
Expand Down Expand Up @@ -137,7 +136,7 @@ To build in a terminal, change directory to the ndn-cxx root, then enter:

.. code-block:: sh
./waf configure # on CentOS, add --without-pch
./waf configure
./waf
sudo ./waf install
Expand All @@ -164,12 +163,12 @@ been installed:
sudo ldconfig
.. note::
When the library is installed in a non-standard path (in general: not in ``/usr/lib``
or ``/usr/local/lib``; on some Linux distros including Fedora: not in ``/usr/lib``),
additional actions may be necessary.
When the library is installed in a non-default location (in general: not in ``/usr/lib``
or ``/usr/local/lib``; on some Linux distros like Fedora and its derivatives, including
CentOS: not in ``/usr/lib``), the following additional actions may be necessary.

The installation path should be added to ``/etc/ld.so.conf`` (or in
``/etc/ld.so.conf.d``) **before** running ``sudo ldconfig``. For example:
The library installation path should be added to ``/etc/ld.so.conf`` or in
``/etc/ld.so.conf.d/*.conf`` **before** running ``ldconfig``. For example:

.. code-block:: sh
Expand Down Expand Up @@ -215,7 +214,7 @@ them, pass ``--with-examples`` during the configuration step:

.. code-block:: sh
./waf configure --with-examples # on CentOS, add --without-pch
./waf configure --with-examples
./waf
sudo ./waf install
sudo ldconfig # on Linux only
Expand Down Expand Up @@ -306,7 +305,7 @@ The following is the suggested build procedure for development builds:

.. code-block:: sh
./waf configure --debug --with-tests # on CentOS, add --without-pch
./waf configure --debug --with-tests
./waf
sudo ./waf install
sudo ldconfig # on Linux only
Expand Down

0 comments on commit fbca611

Please sign in to comment.