From 09e37115dd569cae6c39a4df1bf15bf014a2a337 Mon Sep 17 00:00:00 2001 From: Aleksandar Date: Wed, 2 Sep 2020 17:16:27 +0200 Subject: [PATCH 1/4] Delete Dockerfile --- Dockerfile | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 6b151f4..0000000 --- a/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -FROM eu.artifactory.conti.de:7007/artifactory/c_chs_ctzs_docker_l/ecal-bionic-amd64:latest - -ARG ros_distro - -RUN apt update -RUN DEBIAN_FRONTEND=noninteractive -RUN apt -f install -y --allow-unauthenticated curl gnupg2 lsb-release - -RUN echo "deb https://eu.artifactory.conti.de/artifactory/i_adas_ubuntu_ros_r `lsb_release -cs` main" > /etc/apt/sources.list.d/ros2-latest.list -RUN curl -O -s -S -k -tlsv1 https://eu-test.artifactory.conti.de/artifactory/c_chs_ctzs_generic_l/external/ros/ros.asc -RUN apt-key add ros.asc - -RUN apt update - -RUN apt install -y apt-transport-https -RUN apt install -y ros-${ros_distro}-ros-base -RUN apt install -y python3-colcon-common-extensions - -RUN apt -y upgrade - -RUN curl -s -S -k -tlsv1 https://github.conti.de/storage/releases/13433/files/10987 -o ecal.deb -RUN dpkg -i ecal.deb \ No newline at end of file From ef38882e1cab7904c915f9ec893124c19c1ab156 Mon Sep 17 00:00:00 2001 From: Aleksandar Date: Wed, 2 Sep 2020 17:16:31 +0200 Subject: [PATCH 2/4] Delete Jenkinsfile --- Jenkinsfile | 51 --------------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 3382a13..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,51 +0,0 @@ -pipeline { - agent none - - stages { - stage('Build') { - parallel { - stage('Linux - Eloquent') { - agent { - dockerfile { - additionalBuildArgs "--pull --build-arg ros_distro=eloquent" - label 'DockerHost' - } - } - - stages { - stage('Build') { - steps { - checkout scm - sh ''' - . /opt/ros/eloquent/setup.sh - colcon build - ''' - } - } - } - } - - stage('Linux - Dashing') { - agent { - dockerfile { - additionalBuildArgs "--pull --build-arg ros_distro=dashing" - label 'DockerHost' - } - } - - stages { - stage('Build') { - steps { - checkout scm - sh ''' - . /opt/ros/dashing/setup.sh - colcon build - ''' - } - } - } - } - } - } - } -} \ No newline at end of file From e7b6c9613ad42d8de721eab58acc114a1630a9d6 Mon Sep 17 00:00:00 2001 From: Rex Schilasky <49162693+rex-schilasky@users.noreply.github.com> Date: Thu, 3 Sep 2020 13:14:27 +0200 Subject: [PATCH 3/4] Update README.md eCAL links corrected --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 18309f2..fb8e9f6 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ eCAL RMW can offer: ### Linux -* Install [eCAL](https://github.conti.de/CTZS/ecal) +* Install [eCAL](https://github.com/continental/ecal) * Clone latest release of this repository into your [ROS2 workspace](https://index.ros.org/doc/ros2/Tutorials/Workspace/Creating-A-Workspace/) * Source ROS2 `source /path/to/your/ros/distro/folder/setup.bash` * Run `colcon build` from your workspace folder @@ -21,7 +21,7 @@ eCAL RMW can offer: ### Windows -* Install [eCAL](https://github.conti.de/CTZS/ecal) +* Install [eCAL](https://github.com/continental/ecal) * Clone latest release of this repository into your [ROS2 workspace](https://index.ros.org/doc/ros2/Tutorials/Workspace/Creating-A-Workspace/) * Source ROS2 `call C:/path/to/your/ros/distro/folder/setup.bat` * Run `colcon build` from your workspace folder @@ -51,4 +51,4 @@ RMW can currently work with only one serialization method at the time. ### Currently supported ROS2 distributions * Dashing Diademata -* Eloquent Elusor \ No newline at end of file +* Eloquent Elusor From 13af55097b03366158925bb9322163c7f3a79a1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20=C3=89corchard?= Date: Tue, 8 Sep 2020 11:37:08 +0200 Subject: [PATCH 4/4] Set minimume cmake version to 3.12 `add_compile_options` was added in CMake 3.12. --- rmw_ecal_dynamic_cpp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rmw_ecal_dynamic_cpp/CMakeLists.txt b/rmw_ecal_dynamic_cpp/CMakeLists.txt index fedb4b3..fff1c91 100644 --- a/rmw_ecal_dynamic_cpp/CMakeLists.txt +++ b/rmw_ecal_dynamic_cpp/CMakeLists.txt @@ -16,7 +16,7 @@ # # ========================= RMW eCAL LICENSE ================================= -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.12) project(rmw_ecal_dynamic_cpp) @@ -117,4 +117,4 @@ register_rmw_implementation( "cpp:rosidl_typesupport_cpp:rosidl_typesupport_introspection_cpp" ) -ament_package() \ No newline at end of file +ament_package()