From 333ff557d98700b5c0361af22a2be4acf71322db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Musa=20Morena=20Marcusso=20Manh=C3=A3es?= Date: Fri, 19 Jun 2020 11:57:26 +0200 Subject: [PATCH 1/8] Add Git Action pipeline with industrial_ci configuration for kinetic and melodic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Musa Morena Marcusso Manhães --- .github/workflows/industrial_ci_action.yml | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 .github/workflows/industrial_ci_action.yml diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml new file mode 100644 index 0000000..6b80d1c --- /dev/null +++ b/.github/workflows/industrial_ci_action.yml @@ -0,0 +1,27 @@ +# This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git). +# For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst) + +name: ROS CI + +on: [push, pull_request] # on all pushes and PRs + +jobs: + industrial_ci: + strategy: + matrix: + env: + - {ROS_DISTRO: kinetic, ROS_REPO: main} + - {ROS_DISTRO: melodic, ROS_REPO: main} + env: + CCACHE_DIR: /github/home/.ccache # Directory for ccache (and how we enable ccache in industrial_ci) + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + # This step will fetch/store the directory used by ccache before/after the ci run + - uses: actions/cache@v2 + with: + path: ${{ env.CCACHE_DIR }} + key: ccache-${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }} + # Run industrial_ci + - uses: 'ros-industrial/industrial_ci@master' + env: ${{ matrix.env }} From 2303388e61da3ec7f0f0237fa1913a19e8506fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Musa=20Morena=20Marcusso=20Manh=C3=A3es?= Date: Fri, 19 Jun 2020 11:57:51 +0200 Subject: [PATCH 2/8] Remove Travis CI old scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Musa Morena Marcusso Manhães --- .uuv_ci_config/install_gazebo9.sh | 27 --------------------------- .uuv_ci_config/ros_kinetic.sh | 17 ----------------- .uuv_ci_config/ros_lunar.sh | 17 ----------------- .uuv_ci_config/ros_melodic.sh | 18 ------------------ .uuv_ci_config/run_tests.sh | 21 --------------------- .uuv_ci_config/uuv_dependencies.sh | 20 -------------------- 6 files changed, 120 deletions(-) delete mode 100644 .uuv_ci_config/install_gazebo9.sh delete mode 100644 .uuv_ci_config/ros_kinetic.sh delete mode 100644 .uuv_ci_config/ros_lunar.sh delete mode 100644 .uuv_ci_config/ros_melodic.sh delete mode 100644 .uuv_ci_config/run_tests.sh delete mode 100644 .uuv_ci_config/uuv_dependencies.sh diff --git a/.uuv_ci_config/install_gazebo9.sh b/.uuv_ci_config/install_gazebo9.sh deleted file mode 100644 index 07badc8..0000000 --- a/.uuv_ci_config/install_gazebo9.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 The UUV Simulator Authors. -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -sh -c 'echo "deb http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' - -wget http://packages.osrfoundation.org/gazebo.key -O /tmp/gazebo.key - -apt-key add /tmp/gazebo.key - -apt update - -apt -qq install --no-install-recommends --allow-unauthenticated -y gazebo9 libgazebo9-dev ros-kinetic-gazebo9-* - -# source /usr/share/gazebo-9/setup.sh diff --git a/.uuv_ci_config/ros_kinetic.sh b/.uuv_ci_config/ros_kinetic.sh deleted file mode 100644 index ddbb54b..0000000 --- a/.uuv_ci_config/ros_kinetic.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 The UUV Simulator Authors. -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -sh .uuv_ci_config/uuv_dependencies.sh diff --git a/.uuv_ci_config/ros_lunar.sh b/.uuv_ci_config/ros_lunar.sh deleted file mode 100644 index a52ae74..0000000 --- a/.uuv_ci_config/ros_lunar.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 The UUV Simulator Authors. -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -sh .uuv_ci_config/uuv_dependencies.sh \ No newline at end of file diff --git a/.uuv_ci_config/ros_melodic.sh b/.uuv_ci_config/ros_melodic.sh deleted file mode 100644 index c7b47a5..0000000 --- a/.uuv_ci_config/ros_melodic.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 The UUV Simulator Authors. -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Clone repositories that do not have a ros-lunar package -sh .uuv_ci_config/uuv_dependencies.sh \ No newline at end of file diff --git a/.uuv_ci_config/run_tests.sh b/.uuv_ci_config/run_tests.sh deleted file mode 100644 index 99a6951..0000000 --- a/.uuv_ci_config/run_tests.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 The UUV Simulator Authors. -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -cd $CATKIN_WORKSPACE -source devel/setup.bash -catkin run_tests -catkin_test_results - diff --git a/.uuv_ci_config/uuv_dependencies.sh b/.uuv_ci_config/uuv_dependencies.sh deleted file mode 100644 index 286ce93..0000000 --- a/.uuv_ci_config/uuv_dependencies.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# Copyright (c) 2016 The UUV Simulator Authors. -# All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# DEP PACKAGES -apt -qq install --no-install-recommends --allow-unauthenticated -y \ - build-essential python-catkin-tools python-pip dvi2ps dvipng binutils \ - mesa-utils module-init-tools x-window-system ros-$ROS_DISTRO-python-orocos-kdl From 9da0c475091cbf807871fa76c23e025fffeb2381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Musa=20Morena=20Marcusso=20Manh=C3=A3es?= Date: Fri, 19 Jun 2020 12:05:33 +0200 Subject: [PATCH 3/8] Enable catkin_lint MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Musa Morena Marcusso Manhães --- .github/workflows/industrial_ci_action.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml index 6b80d1c..733c41a 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/industrial_ci_action.yml @@ -10,8 +10,10 @@ jobs: strategy: matrix: env: - - {ROS_DISTRO: kinetic, ROS_REPO: main} - - {ROS_DISTRO: melodic, ROS_REPO: main} + - {ROS_DISTRO: kinetic, ROS_REPO: main, CATKIN_LINT: true} + - {ROS_DISTRO: kinetic, ROS_REPO: main, PRERELEASE: true} + - {ROS_DISTRO: melodic, ROS_REPO: main, CATKIN_LINT: true} + - {ROS_DISTRO: melodic, ROS_REPO: main, PRERELEASE: true} env: CCACHE_DIR: /github/home/.ccache # Directory for ccache (and how we enable ccache in industrial_ci) runs-on: ubuntu-latest From bd832ffaf28109c37e8ab1b6e3ee3b11a86227c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Musa=20Morena=20Marcusso=20Manh=C3=A3es?= Date: Fri, 19 Jun 2020 14:39:49 +0200 Subject: [PATCH 4/8] Add builds with upstream repositories MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Musa Morena Marcusso Manhães --- .github/workflows/industrial_ci_action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml index 733c41a..ae9f01e 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/industrial_ci_action.yml @@ -12,8 +12,10 @@ jobs: env: - {ROS_DISTRO: kinetic, ROS_REPO: main, CATKIN_LINT: true} - {ROS_DISTRO: kinetic, ROS_REPO: main, PRERELEASE: true} + - {ROS_DISTRO: kinetic, ROS_REPO: main, UPSTREAM_WORKSPACE: .eca_a9.rosinstall} - {ROS_DISTRO: melodic, ROS_REPO: main, CATKIN_LINT: true} - {ROS_DISTRO: melodic, ROS_REPO: main, PRERELEASE: true} + - {ROS_DISTRO: melodic, ROS_REPO: main, UPSTREAM_WORKSPACE: .eca_a9.rosinstall} env: CCACHE_DIR: /github/home/.ccache # Directory for ccache (and how we enable ccache in industrial_ci) runs-on: ubuntu-latest From 08f3705b05526fc40c3ecc23b255d23f75b58134 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Musa=20Morena=20Marcusso=20Manh=C3=A3es?= Date: Fri, 19 Jun 2020 14:42:25 +0200 Subject: [PATCH 5/8] Add .rosinstall file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Musa Morena Marcusso Manhães --- .eca_a9.rosinstall | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .eca_a9.rosinstall diff --git a/.eca_a9.rosinstall b/.eca_a9.rosinstall new file mode 100644 index 0000000..69557eb --- /dev/null +++ b/.eca_a9.rosinstall @@ -0,0 +1,3 @@ +- git: + uri: https://github.com/uuvsimulator/uuv_simulator.git + local-name: uuv_simulator \ No newline at end of file From 4e1d7e2cab41306c08cd3f16d5aff5c0fc9dbabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Musa=20Morena=20Marcusso=20Manh=C3=A3es?= Date: Fri, 19 Jun 2020 14:51:46 +0200 Subject: [PATCH 6/8] Add Git Action to create issue branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Musa Morena Marcusso Manhães --- .github/issue-branch.yml | 9 +++++++++ .github/workflows/create_issue_branch.yml | 14 ++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 .github/issue-branch.yml create mode 100644 .github/workflows/create_issue_branch.yml diff --git a/.github/issue-branch.yml b/.github/issue-branch.yml new file mode 100644 index 0000000..8da52f4 --- /dev/null +++ b/.github/issue-branch.yml @@ -0,0 +1,9 @@ +branches: + - label: enhancement + prefix: feature/ + - label: bug + prefix: bugfix/ + - label: documentation + prefix: docs/ + - label: maintenance + prefix: maint/ \ No newline at end of file diff --git a/.github/workflows/create_issue_branch.yml b/.github/workflows/create_issue_branch.yml new file mode 100644 index 0000000..7fab558 --- /dev/null +++ b/.github/workflows/create_issue_branch.yml @@ -0,0 +1,14 @@ +on: + issues: + types: [assigned] + issue_comment: + types: [created] + +jobs: + create_issue_branch_job: + runs-on: ubuntu-latest + steps: + - name: Create Issue Branch + uses: robvanderleek/create-issue-branch@master + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From dd25ce68c52eb136c90f4f29ff34f2634ddb363d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Musa=20Morena=20Marcusso=20Manh=C3=A3es?= Date: Fri, 19 Jun 2020 14:57:51 +0200 Subject: [PATCH 7/8] Change action names MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Musa Morena Marcusso Manhães --- .github/workflows/create_issue_branch.yml | 2 +- .github/workflows/industrial_ci_action.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create_issue_branch.yml b/.github/workflows/create_issue_branch.yml index 7fab558..c8e6464 100644 --- a/.github/workflows/create_issue_branch.yml +++ b/.github/workflows/create_issue_branch.yml @@ -8,7 +8,7 @@ jobs: create_issue_branch_job: runs-on: ubuntu-latest steps: - - name: Create Issue Branch + - name: create issue branch uses: robvanderleek/create-issue-branch@master env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.github/workflows/industrial_ci_action.yml b/.github/workflows/industrial_ci_action.yml index ae9f01e..5346ac3 100644 --- a/.github/workflows/industrial_ci_action.yml +++ b/.github/workflows/industrial_ci_action.yml @@ -1,7 +1,7 @@ # This config uses industrial_ci (https://github.com/ros-industrial/industrial_ci.git). # For troubleshooting, see readme (https://github.com/ros-industrial/industrial_ci/blob/master/README.rst) -name: ROS CI +name: build on: [push, pull_request] # on all pushes and PRs From 222a27dc6e8e0d34312bdec72bef6602a899bf1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Musa=20Morena=20Marcusso=20Manh=C3=A3es?= Date: Fri, 19 Jun 2020 15:01:07 +0200 Subject: [PATCH 8/8] Remove Travis CI file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Musa Morena Marcusso Manhães --- .travis.yml | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 420af2d..0000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ -sudo: required -dist: trusty -language: generic -compiler: - - gcc -cache: - directories: - - $HOME/.ccache # can be any valid cache location -env: - global: - - LIBGL_ALWAYS_SOFTWARE=1 - - VERBOSE_OUTPUT='false' - - CATKIN_CONFIG='--no-install' - - CATKIN_PARALLEL_JOBS='-p1' - - ROS_PARALLEL_JOBS='-j1' - - CCACHE_DIR=$HOME/.ccache - - CATKIN_LINT=true - - CATKIN_LINT_ARGS="--ignore link_directory" -matrix: - include: - - env: PRERELEASE=true USE_DEB=true ROS_DISTRO=kinetic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' USE_DEB=true ROS_DISTRO=kinetic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: PRERELEASE=true USE_DEB=true ROS_DISTRO=lunar ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' USE_DEB=true ROS_DISTRO=lunar ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: PRERELEASE=true USE_DEB=true ROS_DISTRO=melodic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' - - env: AFTER_SCRIPT='sh .uuv_ci_config/run_tests.sh' USE_DEB=true ROS_DISTRO=melodic ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu NOT_TEST_BUILD=true NOT_TEST_INSTALL=true BEFORE_SCRIPT='sh .uuv_ci_config/ros_$ROS_DISTRO.sh' -install: - - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config -script: - - source .ci_config/travis.sh -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/a8c9c6426a721fbb8341 - on_success: change - on_failure: always - on_start: never - slack: uuvsimulator:CeZErwayGqGpYxJaLzCEbjip