Skip to content

Commit

Permalink
[CI] rolling is now the default branch, update CI and README accordin…
Browse files Browse the repository at this point in the history
…gly (#299)

* rolling is now the default branch, update CI and README accordingly
* Use ubuntu latest, doesnt matter much as we run in containers
* [TMP] comment out test_latest job for now

Signed-off-by: Mikael Arguedas <[email protected]>
  • Loading branch information
mikaelarguedas authored May 7, 2024
1 parent 5600fe5 commit 335bcae
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 37 deletions.
72 changes: 37 additions & 35 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,41 +7,42 @@ on:
- cron: '0 20 * * *'

jobs:
test_latest:
runs-on: ubuntu-20.04
# 'osrf/ros2:devel' does *not* include RTI Connext or its' security plugins
# the former gets installed via rosdep in 'action-ros-ci' but the latter do *not* get installed
container: osrf/ros2:devel
steps:
- name: Install prerequisites for action-ros-ci and FastRTPS
run: |
apt-get -qq update
apt-get -qq upgrade -y
apt-get -qq install -y curl libasio-dev libssl-dev libtinyxml2-dev python3-colcon-coveragepy-result
- uses: ros-tooling/[email protected]
with:
package-name: |
sros2
sros2_cmake
test_security
extra-cmake-args: '-DSECURITY=ON --no-warn-unused-cli'
target-ros2-distro: rolling
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v1
if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/master')
with:
file: ros_ws/build/sros2/coverage.xml
flags: unittests
name: sros2-coverage
fail_ci_if_error: true
- name: Upload Logs
uses: actions/upload-artifact@v1
if: failure()
with:
name: colcon-logs
path: ros_ws/log
# test_latest:
# runs-on: ubuntu-latest
# # 'osrf/ros2:devel' does *not* include RTI Connext or its' security plugins
# # the former gets installed via rosdep in 'action-ros-ci' but the latter do *not* get installed
# container: osrf/ros2:devel
# steps:
# - name: Install prerequisites for action-ros-ci and FastRTPS
# run: |
# apt-get -qq update
# apt-get -qq upgrade -y
# apt-get -qq install -y curl libasio-dev libssl-dev libtinyxml2-dev python3-colcon-coveragepy-result
# - uses: ros-tooling/[email protected]
# with:
# package-name: |
# sros2
# sros2_cmake
# test_security
# extra-cmake-args: '-DSECURITY=ON --no-warn-unused-cli'
# target-ros2-distro: rolling
# rosdep-skip-keys: rti-connext-dds-6.0.1
# - name: Upload coverage to Codecov
# uses: codecov/codecov-action@v1
# if: github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/rolling')
# with:
# file: ros_ws/build/sros2/coverage.xml
# flags: unittests
# name: sros2-coverage
# fail_ci_if_error: true
# - name: Upload Logs
# uses: actions/upload-artifact@v1
# if: failure()
# with:
# name: colcon-logs
# path: ros_ws/log
test_nightly:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
# 'osrf/ros2:nightly-rmw-nonfree' includes RTI Connext but
# does *not* include the security plugins or a license allowing the use of Security
container: osrf/ros2:nightly-rmw-nonfree
Expand All @@ -51,8 +52,9 @@ jobs:
run: |
apt-get -qq update
apt-get -qq upgrade -y
. /opt/ros/$ROS_DISTRO/setup.sh
rosdep update
rosdep install -y --from-paths . --ignore-src --rosdistro $ROS_DISTRO
DEBIAN_FRONTEND=noninteractive rosdep install -y --from-paths . --ignore-src --rosdistro $ROS_DISTRO
- name: Build workspace
run: . /opt/ros/$ROS_DISTRO/setup.sh && colcon build
- name: Test workspace
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Context

[![SROS2 CI](https://github.com/ros2/sros2/workflows/SROS2%20CI/badge.svg)](https://github.com/ros2/sros2/actions?query=workflow%3A%22SROS2+CI%22+branch%3Amaster)
[![codecov](https://codecov.io/gh/ros2/sros2/branch/master/graph/badge.svg)](https://codecov.io/gh/ros2/sros2)
[![SROS2 CI](https://github.com/ros2/sros2/workflows/SROS2%20CI/badge.svg)](https://github.com/ros2/sros2/actions?query=workflow%3A%22SROS2+CI%22+branch%3Arolling)
[![codecov](https://codecov.io/gh/ros2/sros2/branch/rolling/graph/badge.svg)](https://codecov.io/gh/ros2/sros2)

This package provides the tools and instructions to use ROS 2 on top of DDS-Security.
The security feature is tested across platforms (Linux, macOS, and Windows) as well as across different languages (C++ and Python).
Expand Down

0 comments on commit 335bcae

Please sign in to comment.