RMR update and I release step 1 of 2
Change-Id: I60d152bba44c0b4960c6776c7251a3a2d9cf325e
Signed-off-by: czichy <thoralf.czichy@nokia.com>
diff --git a/CHANGES b/CHANGES
index 851447d..e9c74b5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,9 @@
# has several changes. Multiple blank lines between versions are
# squished to one.
+2023 13 December; version 2.3.10.
+ Taking in new RMR version 4.9.4.
+
2023 08 June; version 2.3.8
Taking in new RMR version 4.9.1.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9dad6ea..bddbaf1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,7 @@
set( major_version "2" ) # should be automatically populated from git tag later, but until CI process sets a tag we use this
set( minor_version "3" )
-set( patch_level "9" )
+set( patch_level "10" )
set( install_root "${CMAKE_INSTALL_PREFIX}" )
set( install_inc "include/ricxfcpp" )
diff --git a/Dockerfile b/Dockerfile
index 9ee0577..bc7b63e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -44,7 +44,7 @@
WORKDIR /playpen
# Install RMr (runtime and dev) from debian package cached on packagecloud.io
-ARG RMR_VER=4.9.1
+ARG RMR_VER=4.9.4
# if package cloud is actually working, this is preferred
#
@@ -90,6 +90,7 @@
#building and installing pistache
RUN git clone https://github.com/pistacheio/pistache.git
RUN cd pistache && \
+ git checkout 363629b8804177a1e743cecfb880eed552922729 && \
meson setup build \
--buildtype=release \
-DPISTACHE_USE_SSL=true \
diff --git a/build_rmr.sh b/build_rmr.sh
index f1cc321..01600cb 100755
--- a/build_rmr.sh
+++ b/build_rmr.sh
@@ -6,7 +6,7 @@
# repo and installing it. The package method is preferred
# but if that breaks this can be used in place of it.
-rmr_ver=${1:-4.9.1}
+rmr_ver=${1:-4.9.4}
# assume that we're in the proper directory
set -e
diff --git a/docs/rel-notes.rst b/docs/rel-notes.rst
index a8b4efe..0ce891f 100644
--- a/docs/rel-notes.rst
+++ b/docs/rel-notes.rst
@@ -17,6 +17,10 @@
+2023 13 December; version 2.3.10
+--------------------------------
+Taking in new RMR version 4.9.4.
+
2023 08 June; version 2.3.9
-------------------------------
Taking in new RMR version 4.9.1.
diff --git a/rmr-version.yaml b/rmr-version.yaml
index da7a63b..97bdc7e 100644
--- a/rmr-version.yaml
+++ b/rmr-version.yaml
@@ -1,3 +1,3 @@
# Communicate to CI which version of RMR to install in the build/vet environment
---
-version: 4.9.1
+version: 4.9.4