From 2e795276ab517f8204e24de6795bd127b2875d3c Mon Sep 17 00:00:00 2001 From: Sencer Yazici Date: Mon, 14 Feb 2022 22:07:26 +0300 Subject: [PATCH 1/4] switch to industrial_ci --- .github/workflows/ci.yml | 97 ++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 64 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8f3a2d88..aa000dbf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,70 +1,39 @@ name: Ubuntu CI -on: [pull_request] +on: + workflow_dispatch: + pull_request: -jobs: - Test-Focal-Noetic-Gazebo11: +jobs: + build-focal-noetic-gazebo11: + strategy: + matrix: + env: + - {ROS_DISTRO: noetic, ROS_REPO: main} + + env: + UPSTREAM_WORKSPACE: extras/repos/dave_sim.repos + BASEDIR: ${{ github.workspace }}/.work + AFTER_SETUP_UPSTREAM_WORKSPACE: vcs pull $BASEDIR/upstream_ws/src + DOCKER_IMAGE: woensugchoi/dave:latest + TARGET_CMAKE_ARGS: > + -DCMAKE_EXE_LINKER_FLAGS=-fuse-ld=lld + -DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld + -DCMAKE_MODULE_LINKER_FLAGS=-fuse-ld=lld + -DCMAKE_BUILD_TYPE=Release + ADDITIONAL_DEBS: lld net-tools + # CCACHE_DIR: ${{ github.workspace }}/.ccache + # CACHE_PREFIX: ${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }} + # CLANG_TIDY_BASE_REF: ${{ github.base_ref || github.ref }} runs-on: ubuntu-20.04 - container: - image: woensugchoi/dave:latest - steps: - - run: sudo chown -R `whoami`:`whoami` . - - uses: actions/checkout@v2 - - name: Install base dependencies - run: | - sudo apt update; - sudo apt-get -y install cppcheck protobuf-compiler; - - - name: Static code checking - run: sh tools/code_check.sh - - - name: Checkout ds_msgs - uses: actions/checkout@v2 - with: - repository: Field-Robotics-Lab/ds_msgs - path: ds_msgs - - - name: Checkout ds_sim - uses: actions/checkout@v2 - with: - repository: Field-Robotics-Lab/ds_sim - path: ds_sim - - - name: Checkout eca a9 - uses: actions/checkout@v2 - with: - repository: uuvsimulator/eca_a9 - path: eca_a9 - - name: Checkout rexrov2 - uses: actions/checkout@v2 - with: - repository: uuvsimulator/rexrov2 - path: rexrov2 - - - name: Checkout uuv manipulators - uses: actions/checkout@v2 - with: - repository: Field-Robotics-Lab/uuv_manipulators - path: uuv_manipulators - - - name: Checkout uuv simulator - uses: actions/checkout@v2 - with: - repository: Field-Robotics-Lab/uuv_simulator - path: uuv_simulator - - - name: Set up workspace - run: | - mkdir -p /tmp/uuv_ws/src; - ln -s `pwd` /tmp/uuv_ws/src; - - - - name: Build and run tests - shell: bash - run: | - cd /tmp/uuv_ws; - source /opt/ros/noetic/setup.bash; - catkin_make -j1; - catkin_make run_tests -j1; + steps: + - uses: actions/checkout@v2 + - name: Static code checking + run: sh tools/code_check.sh + - name: Prepare + run: | + sed -i "s/git@github.com:/https:\/\/github.com\//g" extras/repos/dave_sim.repos + - uses: 'ros-industrial/industrial_ci@master' + env: ${{ matrix.env }} \ No newline at end of file From 78fc9718c1da57faac3e0a539b4c5125595c7853 Mon Sep 17 00:00:00 2001 From: Sencer Yazici Date: Mon, 14 Feb 2022 22:10:03 +0300 Subject: [PATCH 2/4] add dependencies --- .github/workflows/ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa000dbf..0f5aab4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,10 +30,12 @@ jobs: steps: - uses: actions/checkout@v2 - - name: Static code checking - run: sh tools/code_check.sh - name: Prepare run: | + sudo apt update; + sudo apt-get -y install cppcheck protobuf-compiler; sed -i "s/git@github.com:/https:\/\/github.com\//g" extras/repos/dave_sim.repos + - name: Static code checking + run: sh tools/code_check.sh - uses: 'ros-industrial/industrial_ci@master' env: ${{ matrix.env }} \ No newline at end of file From 4d45589ec59f8f1f6236e551877645094b582eca Mon Sep 17 00:00:00 2001 From: Sencer Yazici Date: Mon, 14 Feb 2022 22:50:28 +0300 Subject: [PATCH 3/4] fix code_check --- .github/workflows/ci.yml | 4 ---- tools/code_check.sh | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0f5aab4e..b4192f33 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,10 +22,6 @@ jobs: -DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld -DCMAKE_MODULE_LINKER_FLAGS=-fuse-ld=lld -DCMAKE_BUILD_TYPE=Release - ADDITIONAL_DEBS: lld net-tools - # CCACHE_DIR: ${{ github.workspace }}/.ccache - # CACHE_PREFIX: ${{ matrix.env.ROS_DISTRO }}-${{ matrix.env.ROS_REPO }} - # CLANG_TIDY_BASE_REF: ${{ github.base_ref || github.ref }} runs-on: ubuntu-20.04 steps: diff --git a/tools/code_check.sh b/tools/code_check.sh index 8284e23a..69dd666c 100755 --- a/tools/code_check.sh +++ b/tools/code_check.sh @@ -156,3 +156,4 @@ if [ $xmlout -eq 1 ]; then elif [ $QUICK_CHECK -eq 0 ]; then echo $CPPLINT_FILES | xargs python tools/cpplint.py 2>&1 fi +echo "" \ No newline at end of file From 6069d32ed7ebc035d7f022641af9589c3327b73f Mon Sep 17 00:00:00 2001 From: Sencer Yazici Date: Mon, 14 Feb 2022 22:55:36 +0300 Subject: [PATCH 4/4] add additional packages --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b4192f33..9bd86e72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,7 @@ jobs: -DCMAKE_SHARED_LINKER_FLAGS=-fuse-ld=lld -DCMAKE_MODULE_LINKER_FLAGS=-fuse-ld=lld -DCMAKE_BUILD_TYPE=Release + ADDITIONAL_DEBS: lld python3-catkin-tools python3-osrf-pycommon runs-on: ubuntu-20.04 steps: