Updated to ROS-independent CI

marip8 · Mar 2, 2023 · e8f03c9 · e8f03c9
1 parent b8678f9
commit e8f03c9
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 36 deletions.
diff --git a/.github/workflows/add_ros_apt_sources.sh b/.github/workflows/add_ros_apt_sources.sh
@@ -0,0 +1,4 @@
+#! /bin/bash
+sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
+curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | apt-key add -
+apt update -qq
diff --git a/.github/workflows/bionic_build.yml b/.github/workflows/bionic_build.yml
@@ -10,19 +10,17 @@ on:
 
 jobs:
   industrial_ci:
-    name: Melodic
+    name: Bionic-Build
     runs-on: ubuntu-latest
     env:
-      CI_NAME: Bionic-Build
-      OS_NAME: ubuntu
-      OS_CODE_NAME: bionic
-      ROS_DISTRO: melodic
-      ROS_REPO: main
-      UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
-      ROSDEP_SKIP_KEYS: "iwyu ros_industrial_cmake_boilerplate"
-      CCACHE_DIR: "/home/runner/work/opw_kinematics/opw_kinematics/Bionic-Build/.ccache"
-      TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DOPW_ENABLE_TESTING=ON"
-      AFTER_SCRIPT: 'catkin build -w $target_ws --no-deps --verbose opw_kinematics --make-args test'
+      DOCKER_IMAGE: ubuntu:18.04
+      ROS_DISTRO: false
+      ADDITIONAL_DEBS: 'curl lsb-release'
+      AFTER_INIT: './github/workflows/add_ros_apt_sources.sh'
+      UPSTREAM_WORKSPACE: dependencies.rosinstall
+      ROSDEP_SKIP_KEYS: 'iwyu ros_industrial_cmake_boilerplate'
+      CCACHE_DIR: /home/runner/work/opw_kinematics/opw_kinematics/Bionic-Build/.ccache
+      TARGET_CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=Debug -DOPW_ENABLE_TESTING=ON'
     steps:
       - uses: actions/checkout@v2
 
@@ -49,5 +47,5 @@ jobs:
           restore-keys: |
             ${{ env.CI_NAME }}-ccache-
 
-      - uses: 'ros-industrial/industrial_ci@master'
+      - uses: 'marip8/industrial_ci@update/ros-independent-ci'
         env: ${{env}}
diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml
@@ -13,17 +13,15 @@ jobs:
     name: CodeCov
     runs-on: ubuntu-latest
     env:
-      CI_NAME: CodeCov
-      OS_NAME: ubuntu
-      OS_CODE_NAME: bionic
-      ROS_DISTRO: melodic
-      ROS_REPO: main
-      ADDITIONAL_DEBS: curl
-      UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
-      ROSDEP_SKIP_KEYS: "iwyu ros_industrial_cmake_boilerplate"
-      CCACHE_DIR: "/home/runner/work/opw_kinematics/opw_kinematics/CodeCov/.ccache"
-      TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DOPW_ENABLE_CODE_COVERAGE=ON"
-      AFTER_SCRIPT: 'catkin build -w $target_ws --no-deps opw_kinematics --make-args ccov-all
+      DOCKER_IMAGE: ubuntu:20.04
+      ROS_DISTRO: false
+      ADDITIONAL_DEBS: 'curl lsb-release'
+      AFTER_INIT: './github/workflows/add_ros_apt_sources.sh'
+      UPSTREAM_WORKSPACE: dependencies.rosinstall
+      ROSDEP_SKIP_KEYS: 'iwyu ros_industrial_cmake_boilerplate'
+      CCACHE_DIR: /home/runner/work/opw_kinematics/opw_kinematics/CodeCov/.ccache
+      TARGET_CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=Debug -DOPW_ENABLE_CODE_COVERAGE=ON'
+      AFTER_SCRIPT: 'cd $target_ws && colcon build --packages-select opw_kinematics --make-args ccov-all
                      && bash <(curl -s https://codecov.io/bash) -t e964c16f-f94e-4caa-8c82-8a142891a19b -s $target_ws/build -f *all-merged.info'
     steps:
       - uses: actions/checkout@v1
@@ -51,5 +49,5 @@ jobs:
           restore-keys: |
             ${{ env.CI_NAME }}-ccache-
 
-      - uses: 'ros-industrial/industrial_ci@master'
+      - uses: 'marip8/industrial_ci@update/ros-independent-ci'
         env: ${{env}}
diff --git a/.github/workflows/focal_build.yml b/.github/workflows/focal_build.yml
@@ -10,19 +10,18 @@ on:
 
 jobs:
   industrial_ci:
-    name: Noetic
+    name: Focal-Build
     runs-on: ubuntu-latest
     env:
-      CI_NAME: Focal-Build
-      OS_NAME: ubuntu
-      OS_CODE_NAME: focal
-      ROS_DISTRO: noetic
-      ROS_REPO: main
-      UPSTREAM_WORKSPACE: 'dependencies.rosinstall'
-      ROSDEP_SKIP_KEYS: "iwyu ros_industrial_cmake_boilerplate"
-      CCACHE_DIR: "/home/runner/work/opw_kinematics/opw_kinematics/Focal-Build/.ccache"
-      BEFORE_RUN_TARGET_TEST_EMBED: "ici_with_unset_variables source /root/target_ws/install/setup.bash"
-      TARGET_CMAKE_ARGS: "-DCMAKE_BUILD_TYPE=Debug -DOPW_ENABLE_TESTING=ON"
+      DOCKER_IMAGE: ubuntu:20.04
+      ROS_DISTRO: false
+      ADDITIONAL_DEBS: 'curl lsb-release'
+      AFTER_INIT: './github/workflows/add_ros_apt_sources.sh'
+      UPSTREAM_WORKSPACE: dependencies.rosinstall
+      ROSDEP_SKIP_KEYS: 'iwyu ros_industrial_cmake_boilerplate'
+      CCACHE_DIR: /home/runner/work/opw_kinematics/opw_kinematics/Focal-Build/.ccache
+      BEFORE_RUN_TARGET_TEST_EMBED: 'ici_with_unset_variables source /root/target_ws/install/setup.bash'
+      TARGET_CMAKE_ARGS: '-DCMAKE_BUILD_TYPE=Debug -DOPW_ENABLE_TESTING=ON'
     steps:
       - uses: actions/checkout@v2
 
@@ -49,5 +48,5 @@ jobs:
           restore-keys: |
             ${{ env.CI_NAME }}-ccache-
 
-      - uses: 'ros-industrial/industrial_ci@master'
+      - uses: 'marip8/industrial_ci@update/ros-independent-ci'
         env: ${{env}}