From da2207ba1e41a8a59d99260b27290caf9865c03e Mon Sep 17 00:00:00 2001 From: Felix Exner Date: Tue, 22 Sep 2020 17:15:09 +0200 Subject: [PATCH] Build ur_msgs in upstream workspace for kinetic --- .github/workflows/ci.yml | 8 ++++---- .kinetic.rosinstall | 10 ++++++++++ .ci.rosinstall => .melodic.rosinstall | 0 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 .kinetic.rosinstall rename .ci.rosinstall => .melodic.rosinstall (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eb1d18867..019de715c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,25 +21,25 @@ jobs: env: - ROS_DISTRO: kinetic ROS_REPO: main - UPSTREAM_WORKSPACE: .ci.rosinstall + UPSTREAM_WORKSPACE: .kinetic.rosinstall DOCKER_RUN_OPTS: --network static_test_net BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101' IMMEDIATE_TEST_OUTPUT: true - ROS_DISTRO: melodic ROS_REPO: main - UPSTREAM_WORKSPACE: .ci.rosinstall + UPSTREAM_WORKSPACE: .melodic.rosinstall DOCKER_RUN_OPTS: --network static_test_net BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101' IMMEDIATE_TEST_OUTPUT: true - ROS_DISTRO: kinetic ROS_REPO: testing - UPSTREAM_WORKSPACE: .ci.rosinstall + UPSTREAM_WORKSPACE: .kinetic.rosinstall DOCKER_RUN_OPTS: --network static_test_net BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101' IMMEDIATE_TEST_OUTPUT: true - ROS_DISTRO: melodic ROS_REPO: testing - UPSTREAM_WORKSPACE: .ci.rosinstall + UPSTREAM_WORKSPACE: .melodic.rosinstall DOCKER_RUN_OPTS: --network static_test_net BEFORE_INIT: 'apt-get update -qq && apt-get install -y iproute2 iputils-ping && ip addr && ping -c5 192.168.56.101' IMMEDIATE_TEST_OUTPUT: true diff --git a/.kinetic.rosinstall b/.kinetic.rosinstall new file mode 100644 index 000000000..575aa2cc9 --- /dev/null +++ b/.kinetic.rosinstall @@ -0,0 +1,10 @@ +- git: + uri: https://github.com/ros-industrial/universal_robot.git + local-name: universal_robot + version: melodic-devel-staging +# under kinetic ur_msgs contains the old service definitions so we need to use the newer ones. +- git: + uri: https://github.com/ros-industrial/ur_msgs.git + local-name: ur_msgs + version: melodic-devel + diff --git a/.ci.rosinstall b/.melodic.rosinstall similarity index 100% rename from .ci.rosinstall rename to .melodic.rosinstall