Skip to content

Commit ece0e1e

Browse files
HansRoboHansRobo
authored
Merge branch 'master' into feature/set_route
2 parents 4ad9d12 + f26565b commit ece0e1e

File tree

68 files changed

+178
-33
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+178
-33
lines changed

‎.github/workflows/BuildAndRun.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,19 @@ jobs:
3636
runs_on: [ubuntu-22.04, ubuntu-22.04-arm]
3737
cmake_build_type: [RelWithDebInfo, Release] # Debug build type is currently unavailable. @TODO Fix problem and add Debug build.
3838
steps:
39+
# workaround until the fix release in the official ros image
40+
- name: Delete old ros2 apt source
41+
run: |
42+
rm /etc/apt/sources.list.d/ros2-latest.list
43+
rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg
44+
45+
- name: Setup new ros2 apt source
46+
run: |
47+
sudo apt-get update && sudo apt-get install curl
48+
export ROS_APT_SOURCE_VERSION=$(curl -s https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest | grep -F "tag_name" | awk -F\" '{print $4}')
49+
curl -L -o /tmp/ros2-apt-source.deb "https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-apt-source_${ROS_APT_SOURCE_VERSION}.$(. /etc/os-release && echo $VERSION_CODENAME)_all.deb"
50+
sudo apt install /tmp/ros2-apt-source.deb
51+
3952
- name: Suppress warnings
4053
run: git config --global --add safe.directory '*'
4154

‎.github/workflows/Release.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,19 @@ jobs:
3232
outputs:
3333
new_version: ${{ steps.new_version.outputs.new_version }}
3434
steps:
35+
# workaround until the fix release in the official ros image
36+
- name: Delete old ros2 apt source
37+
run: |
38+
rm /etc/apt/sources.list.d/ros2-latest.list
39+
rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg
40+
41+
- name: Setup new ros2 apt source
42+
run: |
43+
sudo apt-get update && sudo apt-get install curl
44+
export ROS_APT_SOURCE_VERSION=$(curl -s https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest | grep -F "tag_name" | awk -F\" '{print $4}')
45+
curl -L -o /tmp/ros2-apt-source.deb "https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-apt-source_${ROS_APT_SOURCE_VERSION}.$(. /etc/os-release && echo $VERSION_CODENAME)_all.deb"
46+
sudo apt install /tmp/ros2-apt-source.deb
47+
3548
- name: Restore branch
3649
if: github.event.pull_request.merged == true
3750
uses: levonet/action-restore-branch@master

‎Dockerfile‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,18 @@ SHELL ["/bin/bash", "-c"]
44
ENV DEBIAN_FRONTEND=noninteractive
55
ENV DEBCONF_NOWARNINGS=yes
66

7-
# cspell: ignore kisak
7+
# workaround until the fix release in the official ros image
8+
RUN rm /etc/apt/sources.list.d/ros2-latest.list \
9+
&& rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg
10+
RUN apt-get update \
11+
&& apt-get install -y ca-certificates curl
12+
13+
RUN export ROS_APT_SOURCE_VERSION=$(curl -s https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest | grep -F "tag_name" | awk -F\" '{print $4}') ;\
14+
curl -L -s -o /tmp/ros2-apt-source.deb "https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-apt-source_${ROS_APT_SOURCE_VERSION}.$(. /etc/os-release && echo "$VERSION_CODENAME")_all.deb" \
15+
&& apt-get update \
16+
&& apt-get install -y /tmp/ros2-apt-source.deb \
17+
&& rm -f /tmp/ros2-apt-source.deb
18+
819
RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \
920
--mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \
1021
apt-get update && apt-get -y install python3-pip python3-rospkg python3-rosdep software-properties-common ccache && \

‎Dockerfile.traffic_simulator‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,18 @@ SHELL ["/bin/bash", "-c"]
44
ENV DEBIAN_FRONTEND=noninteractive
55
ENV DEBCONF_NOWARNINGS=yes
66

7+
# workaround until the fix release in the official ros image
8+
RUN rm /etc/apt/sources.list.d/ros2-latest.list \
9+
&& rm /usr/share/keyrings/ros2-latest-archive-keyring.gpg
10+
RUN apt-get update \
11+
&& apt-get install -y ca-certificates curl
12+
13+
RUN export ROS_APT_SOURCE_VERSION=$(curl -s https://api.github.com/repos/ros-infrastructure/ros-apt-source/releases/latest | grep -F "tag_name" | awk -F\" '{print $4}') ;\
14+
curl -L -s -o /tmp/ros2-apt-source.deb "https://github.com/ros-infrastructure/ros-apt-source/releases/download/${ROS_APT_SOURCE_VERSION}/ros2-apt-source_${ROS_APT_SOURCE_VERSION}.$(. /etc/os-release && echo "$VERSION_CODENAME")_all.deb" \
15+
&& apt-get update \
16+
&& apt-get install -y /tmp/ros2-apt-source.deb \
17+
&& rm -f /tmp/ros2-apt-source.deb
18+
719
# cspell: ignore kisak
820
RUN --mount=type=cache,id=apt-cache-amd64,target=/var/cache/apt,sharing=locked \
921
--mount=type=cache,id=apt-lib-amd64,target=/var/lib/apt,sharing=locked \

‎common/agnocast_wrapper/CHANGELOG.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ Changelog for package agnocast_wrapper
55
16.4.2 (2025-05-23)
66
-------------------
77

8+
16.4.6 (2025-06-02)
9+
-------------------
10+
811
16.4.5 (2025-05-30)
912
-------------------
1013

‎common/agnocast_wrapper/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>agnocast_wrapper</name>
5-
<version>16.4.5</version>
5+
<version>16.4.6</version>
66
<description>A wrapper package for agnocast</description>
77
<maintainer email="[email protected]">Mateusz Palczuk</maintainer>
88
<license>Apache License 2.0</license>

‎common/get_parameter/CHANGELOG.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ Changelog for package get_parameter
55
16.4.2 (2025-05-23)
66
-------------------
77

8+
16.4.6 (2025-06-02)
9+
-------------------
10+
811
16.4.5 (2025-05-30)
912
-------------------
1013

‎common/get_parameter/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>get_parameter</name>
5-
<version>16.4.5</version>
5+
<version>16.4.6</version>
66
<description>Thin wrapper for rclcpp::Node::get_parameter</description>
77
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
88
<license>Apache License 2.0</license>

‎common/math/arithmetic/CHANGELOG.rst‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ Changelog for package arithmetic
2424
16.4.2 (2025-05-23)
2525
-------------------
2626

27+
16.4.6 (2025-06-02)
28+
-------------------
29+
2730
16.4.5 (2025-05-30)
2831
-------------------
2932

‎common/math/arithmetic/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
33
<package format="3">
44
<name>arithmetic</name>
5-
<version>16.4.5</version>
5+
<version>16.4.6</version>
66
<description>arithmetic library for scenario_simulator_v2</description>
77
<maintainer email="[email protected]">Tatsuya Yamasaki</maintainer>
88
<license>Apache License 2.0</license>

0 commit comments

Comments
 (0)