From da2646ef9756d14d16189b4eeb7b645126430ab5 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 7 Mar 2024 09:55:12 +0100 Subject: [PATCH 1/3] Fix rolling (#687) * Fix rolling Revert "Fix rolling" This reverts commit c8089311ee5b65a1bcd668af4d1ead09e76341e3. Remove ament lint common Remove ament_lint_auto Remove ament_cmake Update Checkout add test Fix package Fix Remove osrf_testing_tools_cpp Update ubuntu Add test_interface_files Revert "Update ubuntu" This reverts commit 3c4939a2f965ee80d75864cbe464498e66a773df. Revert "Add test_interface_files" This reverts commit 75f9e2141745183a02f4034eeba4c85d01fec451. * Update repos * Add test_interface_files (cherry picked from commit 944843d5aa146465bf29c3b25c7ca108b417907c) # Conflicts: # .github/workflows/ci.yml # .github/workflows/nightly.yml # config/host/generic/client_host_packages.repos # scripts/create_ws.sh --- .github/workflows/ci.yml | 12 ++++++++++++ .github/workflows/nightly.yml | 12 ++++++++++++ config/host/generic/client_host_packages.repos | 9 +++++++++ package.xml | 11 ++--------- scripts/create_firmware_ws.sh | 2 +- scripts/create_ws.sh | 4 ++++ 6 files changed, 40 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62cc3a0f..86504572 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,11 @@ jobs: strategy: fail-fast: false steps: +<<<<<<< HEAD - uses: actions/checkout@v2 +======= + - uses: actions/checkout@v4 +>>>>>>> 944843d (Fix rolling (#687)) with: path: src/micro_ros_setup @@ -58,7 +62,11 @@ jobs: needs: micro_ros_build steps: +<<<<<<< HEAD - uses: actions/checkout@v2 +======= + - uses: actions/checkout@v4 +>>>>>>> 944843d (Fix rolling (#687)) with: path: src/micro_ros_setup @@ -205,7 +213,11 @@ jobs: binary: 'firmware/micro_ros_mbed/cmake_build/DISCO_L475VG_IOT01A/develop/GCC_ARM/micro_ros_mbed.bin' steps: +<<<<<<< HEAD - uses: actions/checkout@v2 +======= + - uses: actions/checkout@v4 +>>>>>>> 944843d (Fix rolling (#687)) with: path: src/micro_ros_setup diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index eade92af..f84e5435 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -29,7 +29,11 @@ jobs: image: ${{ matrix.image }} steps: +<<<<<<< HEAD - uses: actions/checkout@v3.5.2 +======= + - uses: actions/checkout@v4 +>>>>>>> 944843d (Fix rolling (#687)) with: path: src/micro_ros_setup ref: ${{ matrix.branch }} @@ -524,7 +528,11 @@ jobs: container: image: ${{ matrix.image }} steps: +<<<<<<< HEAD - uses: actions/checkout@v3.5.2 +======= + - uses: actions/checkout@v4 +>>>>>>> 944843d (Fix rolling (#687)) with: path: src/micro_ros_setup ref: ${{ matrix.branch }} @@ -594,7 +602,11 @@ jobs: needs: micro_ros_build steps: +<<<<<<< HEAD - uses: actions/checkout@v3.5.2 +======= + - uses: actions/checkout@v4 +>>>>>>> 944843d (Fix rolling (#687)) with: path: src/micro_ros_setup ref: ${{ matrix.branch }} diff --git a/config/host/generic/client_host_packages.repos b/config/host/generic/client_host_packages.repos index 1ebdc314..c4bbbb61 100644 --- a/config/host/generic/client_host_packages.repos +++ b/config/host/generic/client_host_packages.repos @@ -55,4 +55,13 @@ repositories: ros2/unique_identifier_msgs: type: git url: https://github.com/ros2/unique_identifier_msgs +<<<<<<< HEAD version: humble +======= + version: rolling + + ros2/test_interface_files: + type: git + url: https://github.com/ros2/test_interface_files + version: rolling +>>>>>>> 944843d (Fix rolling (#687)) diff --git a/package.xml b/package.xml index 7f0deeb5..c17494b7 100644 --- a/package.xml +++ b/package.xml @@ -4,16 +4,11 @@ micro_ros_setup 3.1.3 Tools for setting up micro-ROS workspaces - Ingo Lütkebohle + Pablo Garrido Apache-2.0 - ament_cmake curl python3-yaml - - asio - tinyxml2 - clang-tidy flex @@ -23,10 +18,8 @@ python3-vcstool - ament_lint_auto - ament_lint_common - ament_cmake + diff --git a/scripts/create_firmware_ws.sh b/scripts/create_firmware_ws.sh index 4ec28bf9..0745c06f 100755 --- a/scripts/create_firmware_ws.sh +++ b/scripts/create_firmware_ws.sh @@ -73,7 +73,7 @@ if [ -z ${EXTERNAL_SKIP+x} ]; then EXTERNAL_SKIP="" fi -SKIP="microxrcedds_agent microxrcedds_client microcdr rosidl_typesupport_connext_cpp rosidl_typesupport_connext_c rosidl_typesupport_opensplice_cpp rosidl_typesupport_opensplice_c rmw_opensplice_cpp ros-${ROS_DISTRO}-cyclonedds ros-${ROS_DISTRO}-rti-connext-dds-cmake-module ros-${ROS_DISTRO}-rmw-connextdds-common ros-${ROS_DISTRO}-rmw-connextdds ros-${ROS_DISTRO}-rmw-cyclonedds-cpp google_benchmark_vendor performance_test_fixture ros-${ROS_DISTRO}-mimick-vendor rmw_cyclonedds_cpp rmw_connext_cpp rti-connext-dds-5.3.1 rmw_connextdds $EXTERNAL_SKIP" +SKIP="microxrcedds_agent microxrcedds_client microcdr rosidl_typesupport_connext_cpp rosidl_typesupport_connext_c rosidl_typesupport_opensplice_cpp rosidl_typesupport_opensplice_c rmw_opensplice_cpp ros-${ROS_DISTRO}-cyclonedds ros-${ROS_DISTRO}-rti-connext-dds-cmake-module ros-${ROS_DISTRO}-rmw-connextdds-common ros-${ROS_DISTRO}-rmw-connextdds ros-${ROS_DISTRO}-rmw-cyclonedds-cpp google_benchmark_vendor performance_test_fixture ros-${ROS_DISTRO}-mimick-vendor rmw_cyclonedds_cpp rmw_connext_cpp rti-connext-dds-5.3.1 rmw_connextdds osrf_testing_tools_cpp $EXTERNAL_SKIP" # Check generic build if [ -d "$PREFIX/config/$RTOS/generic" ]; then diff --git a/scripts/create_ws.sh b/scripts/create_ws.sh index 769e5a9d..f2a0cc9e 100755 --- a/scripts/create_ws.sh +++ b/scripts/create_ws.sh @@ -40,7 +40,11 @@ then fi # ROS_DISTRO SPECIFIC +<<<<<<< HEAD curl -s https://raw.githubusercontent.com/ros2/ros2/humble/ros2.repos |\ +======= +curl -s https://raw.githubusercontent.com/ros2/ros2/rolling/ros2.repos |\ +>>>>>>> 944843d (Fix rolling (#687)) ros2 run micro_ros_setup yaml_filter.py ${PACKAGES} > ros2.repos vcs import --input ros2.repos --skip-existing vcs import --input $REPOS --skip-existing From f496a9dedab38293db76564bd4c7d0e70ea7dbc4 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 7 Mar 2024 09:56:57 +0100 Subject: [PATCH 2/3] Revert "Fix rolling (#687)" This reverts commit da2646ef9756d14d16189b4eeb7b645126430ab5. --- .github/workflows/ci.yml | 12 ------------ .github/workflows/nightly.yml | 12 ------------ config/host/generic/client_host_packages.repos | 9 --------- package.xml | 11 +++++++++-- scripts/create_firmware_ws.sh | 2 +- scripts/create_ws.sh | 4 ---- 6 files changed, 10 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 86504572..62cc3a0f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,11 +18,7 @@ jobs: strategy: fail-fast: false steps: -<<<<<<< HEAD - uses: actions/checkout@v2 -======= - - uses: actions/checkout@v4 ->>>>>>> 944843d (Fix rolling (#687)) with: path: src/micro_ros_setup @@ -62,11 +58,7 @@ jobs: needs: micro_ros_build steps: -<<<<<<< HEAD - uses: actions/checkout@v2 -======= - - uses: actions/checkout@v4 ->>>>>>> 944843d (Fix rolling (#687)) with: path: src/micro_ros_setup @@ -213,11 +205,7 @@ jobs: binary: 'firmware/micro_ros_mbed/cmake_build/DISCO_L475VG_IOT01A/develop/GCC_ARM/micro_ros_mbed.bin' steps: -<<<<<<< HEAD - uses: actions/checkout@v2 -======= - - uses: actions/checkout@v4 ->>>>>>> 944843d (Fix rolling (#687)) with: path: src/micro_ros_setup diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f84e5435..eade92af 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -29,11 +29,7 @@ jobs: image: ${{ matrix.image }} steps: -<<<<<<< HEAD - uses: actions/checkout@v3.5.2 -======= - - uses: actions/checkout@v4 ->>>>>>> 944843d (Fix rolling (#687)) with: path: src/micro_ros_setup ref: ${{ matrix.branch }} @@ -528,11 +524,7 @@ jobs: container: image: ${{ matrix.image }} steps: -<<<<<<< HEAD - uses: actions/checkout@v3.5.2 -======= - - uses: actions/checkout@v4 ->>>>>>> 944843d (Fix rolling (#687)) with: path: src/micro_ros_setup ref: ${{ matrix.branch }} @@ -602,11 +594,7 @@ jobs: needs: micro_ros_build steps: -<<<<<<< HEAD - uses: actions/checkout@v3.5.2 -======= - - uses: actions/checkout@v4 ->>>>>>> 944843d (Fix rolling (#687)) with: path: src/micro_ros_setup ref: ${{ matrix.branch }} diff --git a/config/host/generic/client_host_packages.repos b/config/host/generic/client_host_packages.repos index c4bbbb61..1ebdc314 100644 --- a/config/host/generic/client_host_packages.repos +++ b/config/host/generic/client_host_packages.repos @@ -55,13 +55,4 @@ repositories: ros2/unique_identifier_msgs: type: git url: https://github.com/ros2/unique_identifier_msgs -<<<<<<< HEAD version: humble -======= - version: rolling - - ros2/test_interface_files: - type: git - url: https://github.com/ros2/test_interface_files - version: rolling ->>>>>>> 944843d (Fix rolling (#687)) diff --git a/package.xml b/package.xml index c17494b7..7f0deeb5 100644 --- a/package.xml +++ b/package.xml @@ -4,11 +4,16 @@ micro_ros_setup 3.1.3 Tools for setting up micro-ROS workspaces - Pablo Garrido + Ingo Lütkebohle Apache-2.0 + ament_cmake curl python3-yaml + + asio + tinyxml2 + clang-tidy flex @@ -18,8 +23,10 @@ python3-vcstool + ament_lint_auto + ament_lint_common + ament_cmake - diff --git a/scripts/create_firmware_ws.sh b/scripts/create_firmware_ws.sh index 0745c06f..4ec28bf9 100755 --- a/scripts/create_firmware_ws.sh +++ b/scripts/create_firmware_ws.sh @@ -73,7 +73,7 @@ if [ -z ${EXTERNAL_SKIP+x} ]; then EXTERNAL_SKIP="" fi -SKIP="microxrcedds_agent microxrcedds_client microcdr rosidl_typesupport_connext_cpp rosidl_typesupport_connext_c rosidl_typesupport_opensplice_cpp rosidl_typesupport_opensplice_c rmw_opensplice_cpp ros-${ROS_DISTRO}-cyclonedds ros-${ROS_DISTRO}-rti-connext-dds-cmake-module ros-${ROS_DISTRO}-rmw-connextdds-common ros-${ROS_DISTRO}-rmw-connextdds ros-${ROS_DISTRO}-rmw-cyclonedds-cpp google_benchmark_vendor performance_test_fixture ros-${ROS_DISTRO}-mimick-vendor rmw_cyclonedds_cpp rmw_connext_cpp rti-connext-dds-5.3.1 rmw_connextdds osrf_testing_tools_cpp $EXTERNAL_SKIP" +SKIP="microxrcedds_agent microxrcedds_client microcdr rosidl_typesupport_connext_cpp rosidl_typesupport_connext_c rosidl_typesupport_opensplice_cpp rosidl_typesupport_opensplice_c rmw_opensplice_cpp ros-${ROS_DISTRO}-cyclonedds ros-${ROS_DISTRO}-rti-connext-dds-cmake-module ros-${ROS_DISTRO}-rmw-connextdds-common ros-${ROS_DISTRO}-rmw-connextdds ros-${ROS_DISTRO}-rmw-cyclonedds-cpp google_benchmark_vendor performance_test_fixture ros-${ROS_DISTRO}-mimick-vendor rmw_cyclonedds_cpp rmw_connext_cpp rti-connext-dds-5.3.1 rmw_connextdds $EXTERNAL_SKIP" # Check generic build if [ -d "$PREFIX/config/$RTOS/generic" ]; then diff --git a/scripts/create_ws.sh b/scripts/create_ws.sh index f2a0cc9e..769e5a9d 100755 --- a/scripts/create_ws.sh +++ b/scripts/create_ws.sh @@ -40,11 +40,7 @@ then fi # ROS_DISTRO SPECIFIC -<<<<<<< HEAD curl -s https://raw.githubusercontent.com/ros2/ros2/humble/ros2.repos |\ -======= -curl -s https://raw.githubusercontent.com/ros2/ros2/rolling/ros2.repos |\ ->>>>>>> 944843d (Fix rolling (#687)) ros2 run micro_ros_setup yaml_filter.py ${PACKAGES} > ros2.repos vcs import --input ros2.repos --skip-existing vcs import --input $REPOS --skip-existing From 71cc02a407a2f364931b255c011ea16e53ce88b2 Mon Sep 17 00:00:00 2001 From: Pablo Garrido Date: Thu, 7 Mar 2024 09:58:25 +0100 Subject: [PATCH 3/3] FIx --- .github/workflows/ci.yml | 6 +++--- .github/workflows/nightly.yml | 6 +++--- package.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62cc3a0f..63c493f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: path: src/micro_ros_setup @@ -58,7 +58,7 @@ jobs: needs: micro_ros_build steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: path: src/micro_ros_setup @@ -205,7 +205,7 @@ jobs: binary: 'firmware/micro_ros_mbed/cmake_build/DISCO_L475VG_IOT01A/develop/GCC_ARM/micro_ros_mbed.bin' steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: path: src/micro_ros_setup diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index eade92af..c34b8a09 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -29,7 +29,7 @@ jobs: image: ${{ matrix.image }} steps: - - uses: actions/checkout@v3.5.2 + - uses: actions/checkout@v4 with: path: src/micro_ros_setup ref: ${{ matrix.branch }} @@ -524,7 +524,7 @@ jobs: container: image: ${{ matrix.image }} steps: - - uses: actions/checkout@v3.5.2 + - uses: actions/checkout@v4 with: path: src/micro_ros_setup ref: ${{ matrix.branch }} @@ -594,7 +594,7 @@ jobs: needs: micro_ros_build steps: - - uses: actions/checkout@v3.5.2 + - uses: actions/checkout@v4 with: path: src/micro_ros_setup ref: ${{ matrix.branch }} diff --git a/package.xml b/package.xml index 7f0deeb5..b00a29be 100644 --- a/package.xml +++ b/package.xml @@ -4,7 +4,7 @@ micro_ros_setup 3.1.3 Tools for setting up micro-ROS workspaces - Ingo Lütkebohle + Pablo Garrido Apache-2.0 ament_cmake