Skip to content

Commit

Permalink
Merge pull request #2126 from ApexAI/iox-2099-prepare-v-2-0-5-release
Browse files Browse the repository at this point in the history
Prepare `v2.0.5` release
  • Loading branch information
mossmaurice authored Dec 4, 2023
2 parents 8e271dd + a80bd29 commit e274957
Show file tree
Hide file tree
Showing 18 changed files with 35 additions and 25 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.4
2.0.5
2 changes: 1 addition & 1 deletion cmake/package/package.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
2 changes: 1 addition & 1 deletion doc/aspice_swe3_4/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
1 change: 1 addition & 0 deletions doc/website/release-notes/.pages
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion doc/website/release-notes/iceoryx-v2-0-4.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
9 changes: 9 additions & 0 deletions doc/website/release-notes/iceoryx-v2-0-5.md
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion iceoryx_binding_c/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")



Expand Down
2 changes: 1 addition & 1 deletion iceoryx_binding_c/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion iceoryx_dds/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
2 changes: 1 addition & 1 deletion iceoryx_hoofs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
2 changes: 1 addition & 1 deletion iceoryx_hoofs/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion iceoryx_integrationtest/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion iceoryx_posh/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
2 changes: 1 addition & 1 deletion iceoryx_posh/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
14 changes: 7 additions & 7 deletions tools/ci/run-integration-test.sh
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion tools/introspection/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})

Expand Down
2 changes: 1 addition & 1 deletion tools/introspection/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit e274957

Please sign in to comment.