Merge pull request #17 from sonia-auv/develop

Develop
sonia-auv · Aug 3, 2020 · 7f9407b · 7f9407b
2 parents 3c505ac + 9abde54
commit 7f9407b
Show file tree

Hide file tree

Showing 10 changed files with 111 additions and 109 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,2 @@
+build
+devel
diff --git a/.../workflows/docker-image-robot-develop.yml → ...flows/docker-image-perception-develop.yml b/.../workflows/docker-image-robot-develop.yml → ...flows/docker-image-perception-develop.yml
@@ -5,13 +5,13 @@ on:
     branches: [develop]
 
 jobs:
-  build-ros-robot-x86-64:
-    name: "Build ROS robot X86/64"
+  build-ros-perception-x86-64:
+    name: "Build ROS perception X86/64"
     runs-on: ubuntu-latest
     env:
-      BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_messages/sonia_messages:x86-robot-latest"
+      BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_common/sonia_common:x86-perception-latest"
       ARCH: x86
-      TARGET_TYPE: robot
+      TARGET_TYPE: perception
       TARGET_VERSION: develop
       IMAGE_NAME: provider_actuators
       GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
@@ -20,7 +20,7 @@ jobs:
       - name: Login to Github Package Registry
         run: |
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
-      - name: Build the docker image (robot based)
+      - name: Build the docker image (perception based)
         run: |
           docker build . --tag build-${TARGET_VERSION}-${GITHUB_REF##*/}-${GITHUB_RUN_NUMBER} --build-arg BUILD_DATE=$(date '+%Y-%m-%d_%H:%M:%S') --build-arg VERSION=${GITHUB_REF##*/}-$(date '  +%Y-%m-%d_%H:%M:%S') --build-arg BASE_IMAGE=${BASE_IMAGE}
 
@@ -37,13 +37,13 @@ jobs:
         run: |
           docker push ${GITHUB_REMOTE_URL}/${IMAGE_NAME}
 
-  build-ros-robot-arm64:
-    name: "Build ROS robot ARM64"
+  build-ros-perception-arm64:
+    name: "Build ROS perception ARM64"
     runs-on: ubuntu-latest
     env:
-      BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_messages/sonia_messages:arm64-robot-latest"
+      BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_common/sonia_common:arm64-perception-latest"
       ARCH: arm64
-      TARGET_TYPE: robot
+      TARGET_TYPE: perception
       TARGET_VERSION: develop
       IMAGE_NAME: provider_actuators
       GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
@@ -65,7 +65,7 @@ jobs:
           sudo apt-get install qemu binfmt-support qemu-user-static
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 
-      - name: Build the docker image (robot based)
+      - name: Build the docker image (perception based)
         run: |
           docker build . --tag build-${TARGET_VERSION}-${GITHUB_REF##*/}-${GITHUB_RUN_NUMBER} --build-arg BUILD_DATE=$(date '+%Y-%m-%d_%H:%M:%S') --build-arg VERSION=${GITHUB_REF##*/}-$(date '  +%Y-%m-%d_%H:%M:%S') --build-arg BASE_IMAGE=${BASE_IMAGE}
 
@@ -85,7 +85,7 @@ jobs:
   notify-success:
     name: "Notify Slack - Success"
     runs-on: ubuntu-latest
-    needs: [build-ros-robot-x86-64, build-ros-robot-arm64]
+    needs: [build-ros-perception-x86-64, build-ros-perception-arm64]
     if: success()
     steps:
       - name: Notify Slack Success
@@ -100,7 +100,7 @@ jobs:
   notify-fail:
     name: "Notify Slack - Failure"
     runs-on: ubuntu-latest
-    needs: [build-ros-robot-x86-64, build-ros-robot-arm64]
+    needs: [build-ros-perception-x86-64, build-ros-perception-arm64]
     if: failure()
     steps:
       - name: Notify Slack Fail

diff --git a/.../workflows/docker-image-robot-feature.yml → ...flows/docker-image-perception-feature.yml b/.../workflows/docker-image-robot-feature.yml → ...flows/docker-image-perception-feature.yml
@@ -5,13 +5,13 @@ on:
     branches: [feature/**]
 
 jobs:
-  build-ros-robot-x86-64:
-    name: "Build ROS robot X86/64"
+  build-ros-perception-x86-64:
+    name: "Build ROS perception X86/64"
     runs-on: ubuntu-latest
     env:
-      BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_messages/sonia_messages:x86-robot-latest"
+      BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_common/sonia_common:x86-perception-latest"
       ARCH: x86
-      TARGET_TYPE: robot
+      TARGET_TYPE: perception
       TARGET_VERSION: feature
       IMAGE_NAME: provider_actuators
       GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
@@ -20,7 +20,7 @@ jobs:
       - name: Login to Github Package Registry
         run: |
           echo "${{ secrets.GITHUB_TOKEN }}" | docker login docker.pkg.github.com -u ${{ github.actor }} --password-stdin
-      - name: Build the docker image (robot based)
+      - name: Build the docker image (perception based)
         run: |
           docker build . --tag build-feature-${GITHUB_REF##*/}-${GITHUB_RUN_NUMBER} --build-arg BUILD_DATE=$(date '+%Y-%m-%d_%H:%M:%S') --build-arg VERSION=${GITHUB_REF##*/}-$(date '  +%Y-%m-%d_%H:%M:%S') --build-arg BASE_IMAGE=${BASE_IMAGE}
 
@@ -32,13 +32,13 @@ jobs:
         run: |
           docker push ${GITHUB_REMOTE_URL}/${IMAGE_NAME}:${ARCH}-${TARGET_TYPE}-${TARGET_VERSION}-${GITHUB_REF##*/}
 
-  build-ros-robot-arm64:
-    name: "Build ROS robot ARM64"
+  build-ros-perception-arm64:
+    name: "Build ROS perception ARM64"
     runs-on: ubuntu-latest
     env:
-      BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_messages/sonia_messages:arm64-robot-latest"
+      BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_common/sonia_common:arm64-perception-latest"
       ARCH: arm64
-      TARGET_TYPE: robot
+      TARGET_TYPE: perception
       TARGET_VERSION: feature
       IMAGE_NAME: provider_actuators
       GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
@@ -60,7 +60,7 @@ jobs:
           sudo apt-get install qemu binfmt-support qemu-user-static
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 
-      - name: Build the docker image (robot based)
+      - name: Build the docker image (perception based)
         run: |
           docker build . --tag build-feature-${GITHUB_REF##*/}-${GITHUB_RUN_NUMBER} --build-arg BUILD_DATE=$(date '+%Y-%m-%d_%H:%M:%S') --build-arg VERSION=${GITHUB_REF##*/}-$(date '  +%Y-%m-%d_%H:%M:%S') --build-arg BASE_IMAGE=${BASE_IMAGE}
 
@@ -75,7 +75,7 @@ jobs:
   notify-success:
     name: "Notify Slack - Success"
     runs-on: ubuntu-latest
-    needs: [build-ros-robot-x86-64, build-ros-robot-arm64]
+    needs: [build-ros-perception-x86-64, build-ros-perception-arm64]
     if: success()
     steps:
       - name: Notify Slack Success
@@ -90,7 +90,7 @@ jobs:
   notify-fail:
     name: "Notify Slack - Failure"
     runs-on: ubuntu-latest
-    needs: [build-ros-robot-x86-64, build-ros-robot-arm64]
+    needs: [build-ros-perception-x86-64, build-ros-perception-arm64]
     if: failure()
     steps:
       - name: Notify Slack Fail

diff --git a/...b/workflows/docker-image-robot-master.yml → ...kflows/docker-image-perception-master.yml b/...b/workflows/docker-image-robot-master.yml → ...kflows/docker-image-perception-master.yml
@@ -5,13 +5,13 @@ on:
     branches: [master]
 
 jobs:
-  build-ros-robot-x86-64:
-    name: "Build ROS robot X86/64"
+  build-ros-perception-x86-64:
+    name: "Build ROS perception X86/64"
     runs-on: ubuntu-latest
     env:
-      BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_messages/sonia_messages:x86-robot-latest"
+      BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_common/sonia_common:x86-perception-latest"
       ARCH: x86
-      TARGET_TYPE: robot
+      TARGET_TYPE: perception
       IMAGE_NAME: provider_actuators
       GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
     steps:
@@ -22,7 +22,7 @@ jobs:
       - name: Set Target version
         run: echo '::set-env name=TARGET_VERSION::release-'$(sed -n -e 's/.*<version>\(.*\)<\/version>.*/\1/p' package.xml)
 
-      - name: Build the docker image (robot based)
+      - name: Build the docker image (perception based)
         run: |
           docker build . --tag build-${TARGET_VERSION}-${GITHUB_REF##*/}-${GITHUB_RUN_NUMBER} --build-arg BUILD_DATE=$(date '+%Y-%m-%d_%H:%M:%S') --build-arg VERSION=${GITHUB_REF##*/}-$(date '+%Y-%m-%d_%H:%M:%S') --build-arg BASE_IMAGE=${BASE_IMAGE}
 
@@ -41,13 +41,13 @@ jobs:
         run: |
           docker push ${GITHUB_REMOTE_URL}/${IMAGE_NAME}
 
-  build-ros-robot-arm64:
-    name: "Build ROS robot ARM64"
+  build-ros-perception-arm64:
+    name: "Build ROS perception ARM64"
     runs-on: ubuntu-latest
     env:
-      BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_messages/sonia_messages:arm64-robot-latest"
+      BASE_IMAGE: "docker.pkg.github.com/sonia-auv/sonia_common/sonia_common:arm64-perception-latest"
       ARCH: arm64
-      TARGET_TYPE: robot
+      TARGET_TYPE: perception
       IMAGE_NAME: provider_actuators
       GITHUB_REMOTE_URL: docker.pkg.github.com/${{ github.repository }}
     steps:
@@ -67,11 +67,11 @@ jobs:
 
       - name: Install QEMU to be able to compile on X86 into ARM64
         run: |
-
+          sudo apt-get update
           sudo apt-get install qemu binfmt-support qemu-user-static
           docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
 
-      - name: Build the docker image (robot based)
+      - name: Build the docker image (perception based)
         run: |
           docker build . --tag build-${TARGET_VERSION}-${GITHUB_REF##*/}-${GITHUB_RUN_NUMBER} --build-arg BUILD_DATE=$(date '+%Y-%m-%d_%H:%M:%S') --build-arg VERSION=${GITHUB_REF##*/}-$(date '  +%Y-%m-%d_%H:%M:%S') --build-arg BASE_IMAGE=${BASE_IMAGE}
 
@@ -92,7 +92,7 @@ jobs:
   create-release:
     name: "Create Github Release"
     runs-on: ubuntu-latest
-    needs: [build-ros-robot-x86-64, build-ros-robot-arm64]
+    needs: [build-ros-perception-x86-64, build-ros-perception-arm64]
     steps:
       - uses: actions/checkout@v2
       - name: Set Target version
@@ -118,7 +118,7 @@ jobs:
   notify-success:
     name: "Notify Slack - Success"
     runs-on: ubuntu-latest
-    needs: [build-ros-robot-x86-64, build-ros-robot-arm64, create-release]
+    needs: [build-ros-perception-x86-64, build-ros-perception-arm64, create-release]
     if: success()
     steps:
       - name: Notify Slack Success
@@ -133,7 +133,7 @@ jobs:
   notify-fail:
     name: "Notify Slack - Failure"
     runs-on: ubuntu-latest
-    needs: [build-ros-robot-x86-64, build-ros-robot-arm64, create-release]
+    needs: [build-ros-perception-x86-64, build-ros-perception-arm64, create-release]
     if: failure()
     steps:
       - name: Notify Slack Fail

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ find_package(
         roscpp
         cmake_modules
         std_msgs
-        sonia_msgs
+        sonia_common
 )
 
 #===============================================================================
@@ -41,7 +41,7 @@ catkin_package(
         CATKIN_DEPENDS
         roscpp
         std_msgs
-        sonia_msgs
+        sonia_common
 )
 
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG BASE_IMAGE="docker.pkg.github.com/sonia-auv/sonia_messages/sonia_messages:x86-robot-latest"
+ARG BASE_IMAGE="docker.pkg.github.com/sonia-auv/sonia_common/sonia_common:x86-perception-latest"
 
 FROM ${BASE_IMAGE}
 

diff --git a/README.md b/README.md
@@ -85,7 +85,7 @@ Add additional notes about how to deploy this on a live system
 
 Add additional project dependencies
 
-* [ROS](http://wiki.ros.org/) - ROS robotic framework
+* [ROS](http://wiki.ros.org/) - ROS perceptionic framework
 
 
 ## Versioning

diff --git a/package.xml b/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package>
   <name>provider_actuators</name>
-  <version>1.0.0</version>
+  <version>1.1.0</version>
   <description>
     The provider_actuators is responsible to communicate with IO board.
   </description>
@@ -17,10 +17,10 @@
 
     <build_depend>roscpp</build_depend>
     <build_depend>std_msgs</build_depend>
-    <build_depend>sonia_msgs</build_depend>
+    <build_depend>sonia_common</build_depend>
 
     <run_depend>roscpp</run_depend>
     <run_depend>std_msgs</run_depend>
-    <run_depend>sonia_msgs</run_depend>
+    <run_depend>sonia_common</run_depend>
 
 </package>