Merge pull request #2126 from ApexAI/iox-2099-prepare-v-2-0-5-release

mossmaurice-apexai · web-flow · commit e274957ac619 · 2023-12-04T15:02:57.000+01:00
Prepare `v2.0.5` release
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           version: 9
           platform: x64
-      - uses: jwlawson/actions-setup-cmake@v1.12
+      - uses: jwlawson/actions-setup-cmake@v1.13
         with:
           cmake-version: '3.16.3' # version used in Ubuntu 20.04 LTS
       - run: ./tools/ci/build-test-ubuntu.sh
@@ -61,13 +61,13 @@ jobs:
         shell: powershell
 
   run-integration-test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: pre-flight-check
     steps:
       - name: Setup ROS
-        uses: ros-tooling/setup-ros@0.2.1
+        uses: ros-tooling/setup-ros@v0.7
         with:
-          required-ros-distributions: foxy
+          required-ros-distributions: humble
       - uses: actions/checkout@v2
       - run: ./tools/ci/run-integration-test.sh
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.0.4
+2.0.5
diff --git a/cmake/package/package.cmake b/cmake/package/package.cmake
@@ -14,7 +14,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 cmake_minimum_required(VERSION 3.16)
-set(IOX_VERSION_STRING "2.0.4")
+set(IOX_VERSION_STRING "2.0.5")
 
 project(iceoryx_package VERSION ${IOX_VERSION_STRING})
 
diff --git a/doc/aspice_swe3_4/CMakeLists.txt b/doc/aspice_swe3_4/CMakeLists.txt
@@ -16,7 +16,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-set(IOX_VERSION_STRING "2.0.4")
+set(IOX_VERSION_STRING "2.0.5")
 
 project(iceoryx_doc VERSION ${IOX_VERSION_STRING})
 
diff --git a/doc/website/release-notes/.pages b/doc/website/release-notes/.pages
@@ -1,4 +1,5 @@
 nav:
+  - iceoryx-v2-0-5.md
   - iceoryx-v2-0-4.md
   - iceoryx-v2-0-3.md
   - iceoryx-v2-0-2.md
diff --git a/doc/website/release-notes/iceoryx-v2-0-4.md b/doc/website/release-notes/iceoryx-v2-0-4.md
@@ -1,6 +1,6 @@
 # iceoryx v2.0.4
 
-## [v2.0.4](https://github.com/eclipse-iceoryx/iceoryx/tree/v2.0.4) (2023-11-xx)
+## [v2.0.4](https://github.com/eclipse-iceoryx/iceoryx/tree/v2.0.4) (2023-11-27)
 
 [Full Changelog](https://github.com/eclipse-iceoryx/iceoryx/compare/v2.0.3...v2.0.4)
 
diff --git a/doc/website/release-notes/iceoryx-v2-0-5.md b/doc/website/release-notes/iceoryx-v2-0-5.md
@@ -0,0 +1,9 @@
+# iceoryx v2.0.5
+
+## [v2.0.5](https://github.com/eclipse-iceoryx/iceoryx/tree/v2.0.5) (2023-11-30)
+
+[Full Changelog](https://github.com/eclipse-iceoryx/iceoryx/compare/v2.0.4...v2.0.5)
+
+**Bugfixes:**
+
+- Fix ROS 2 RHEL build [\#2099](https://github.com/eclipse-iceoryx/iceoryx/issues/2099)
diff --git a/iceoryx_binding_c/CMakeLists.txt b/iceoryx_binding_c/CMakeLists.txt
@@ -16,7 +16,7 @@
 # SPDX-License-Identifier: Apache-2.0
 cmake_minimum_required(VERSION 3.16)
 
-set(IOX_VERSION_STRING "2.0.4")
+set(IOX_VERSION_STRING "2.0.5")
 
 
 
diff --git a/iceoryx_binding_c/package.xml b/iceoryx_binding_c/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
     <name>iceoryx_binding_c</name>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
     <description>Eclipse iceoryx inter-process-communication (IPC) middleware C-Language Binding</description>
     <maintainer email="iceoryx-oss-support@apex.ai">Eclipse Foundation, Inc.</maintainer>
     <license>Apache 2.0</license>
diff --git a/iceoryx_dds/CMakeLists.txt b/iceoryx_dds/CMakeLists.txt
@@ -16,7 +16,7 @@
 # SPDX-License-Identifier: Apache-2.0
 cmake_minimum_required(VERSION 3.16)
 
-set(IOX_VERSION_STRING "2.0.4")
+set(IOX_VERSION_STRING "2.0.5")
 
 project(iceoryx_dds VERSION ${IOX_VERSION_STRING})
 
diff --git a/iceoryx_hoofs/CMakeLists.txt b/iceoryx_hoofs/CMakeLists.txt
@@ -17,7 +17,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-set(IOX_VERSION_STRING "2.0.4")
+set(IOX_VERSION_STRING "2.0.5")
 
 project(iceoryx_hoofs VERSION ${IOX_VERSION_STRING})
 
diff --git a/iceoryx_hoofs/package.xml b/iceoryx_hoofs/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
     <name>iceoryx_hoofs</name>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
     <description>Eclipse iceoryx inter-process-communication (IPC) middleware basic building blocks</description>
     <maintainer email="iceoryx-oss-support@apex.ai">Eclipse Foundation, Inc.</maintainer>
     <license>Apache 2.0</license>
diff --git a/iceoryx_integrationtest/package.xml b/iceoryx_integrationtest/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>iceoryx_integrationtest</name>
-  <version>2.0.4</version>
+  <version>2.0.5</version>
   <description>iceoryx Software Integrationtest</description>
     <maintainer email="iceoryx-oss-support@apex.ai">Eclipse Foundation, Inc.</maintainer>
     <license>Apache 2.0</license>
diff --git a/iceoryx_posh/CMakeLists.txt b/iceoryx_posh/CMakeLists.txt
@@ -16,7 +16,7 @@
 # SPDX-License-Identifier: Apache-2.0
 cmake_minimum_required(VERSION 3.16)
 
-set(IOX_VERSION_STRING "2.0.4")
+set(IOX_VERSION_STRING "2.0.5")
 
 project(iceoryx_posh VERSION ${IOX_VERSION_STRING})
 
diff --git a/iceoryx_posh/package.xml b/iceoryx_posh/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
     <name>iceoryx_posh</name>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
     <description>Eclipse iceoryx inter-process-communication (IPC) middleware Posix Shared Memory Library and middleware daemon (RouDi)</description>
     <maintainer email="iceoryx-oss-support@apex.ai">Eclipse Foundation, Inc.</maintainer>
     <license>Apache 2.0</license>
diff --git a/tools/ci/run-integration-test.sh b/tools/ci/run-integration-test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2021 by Apex.AI Inc. All rights reserved.
+# Copyright (c) 2021 - 2023 by Apex.AI Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -29,18 +29,18 @@ cd "${WORKSPACE}"
 msg "installing dependencies"
 # NOTE: github action ros-tooling/setup-ros@0.2.1 should be run before
 sudo apt install -y apt-transport-https
-sudo apt update && sudo apt install -y cmake libacl1-dev libncurses5-dev pkg-config ros-foxy-ros-testing
+sudo apt update && sudo apt install -y cmake libacl1-dev libncurses5-dev pkg-config ros-humble-ros-testing
 
 msg "sourcing ROS workspace"
 # shellcheck source=/dev/null
-source /opt/ros/foxy/setup.bash
+source /opt/ros/humble/setup.bash
 
 msg "checking copyrights"
-sudo rm -rf /opt/ros/foxy/lib/python3.8/site-packages/ament_copyright/template/apache2_header.txt
-sudo cp -rf tools/apache2_header.txt /opt/ros/foxy/lib/python3.8/site-packages/ament_copyright/template/.
+sudo rm -rf /opt/ros/humble/lib/python3.10/site-packages/ament_copyright/template/apache2_header.txt
+sudo cp -rf tools/apache2_header.txt /opt/ros/humble/lib/python3.10/site-packages/ament_copyright/template/.
 # shellcheck disable=SC2026
-sudo sed -i '41 c\"'c'", "'cc'", "'cpp'", "'cxx'", "'h'", "'hh'", "'hpp'", "'hxx'", "'inl'", "'sh'"' /opt/ros/foxy/lib/python3.8/site-packages/ament_copyright/main.py
-ament_copyright --exclude LICENSE CONTRIBUTING.md tools/apache2_header.txt
+sudo sed -i '41 c\"'c'", "'cc'", "'cpp'", "'cxx'", "'h'", "'hh'", "'hpp'", "'hxx'", "'inl'", "'sh'"' /opt/ros/humble/lib/python3.10/site-packages/ament_copyright/main.py
+ament_copyright ./**/* tools/apache2_header.txt
 
 msg "compiler versions:
 $(gcc --version)
diff --git a/tools/introspection/CMakeLists.txt b/tools/introspection/CMakeLists.txt
@@ -17,7 +17,7 @@
 
 cmake_minimum_required(VERSION 3.16)
 
-set(IOX_VERSION_STRING "2.0.4")
+set(IOX_VERSION_STRING "2.0.5")
 
 project(iceoryx_introspection VERSION ${IOX_VERSION_STRING})
 
diff --git a/tools/introspection/package.xml b/tools/introspection/package.xml
@@ -2,7 +2,7 @@
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
     <name>iceoryx_introspection</name>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
     <description>Eclipse iceoryx inter-process-communication (IPC) middleware introspection client</description>
     <maintainer email="iceoryx-oss-support@apex.ai">Eclipse Foundation, Inc.</maintainer>
     <license>Apache 2.0</license>

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`#`
`15`	`15`	`# SPDX-License-Identifier: Apache-2.0`
`16`	`16`	`cmake_minimum_required(VERSION 3.16)`
`17`		`-set(IOX_VERSION_STRING "2.0.4")`
	`17`	`+set(IOX_VERSION_STRING "2.0.5")`
`18`	`18`
`19`	`19`	`project(iceoryx_package VERSION ${IOX_VERSION_STRING})`
`20`	`20`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`nav:`
	`2`	`+ - iceoryx-v2-0-5.md`
`2`	`3`	`- iceoryx-v2-0-4.md`
`3`	`4`	`- iceoryx-v2-0-3.md`
`4`	`5`	`- iceoryx-v2-0-2.md`