Merge pull request #80 from AutoModality/AM-750/fix_cv_bridge_arm64

feat: update for arm64

Author: Aaron Roller

.github/workflows/nightly.yml

@@ -1,15 +1,14 @@
 name: Nightly
-on:
-  schedule:
-    - cron: '00 10 * * *'
+on: 
+  push:
+    branches-ignore:
+      - master
 jobs:
-  build:
-    runs-on: ubuntu-18.04
+  package:
+    runs-on: [x64, self-hosted,linux,build]
     steps:
+      - uses: AutoModality/action-clean@v1.1.0
       - uses: actions/checkout@v2
-      - name: Package
-        id: package
-        uses: AutoModality/action-package-debian-ros@v5-ros
-        with:
-          release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }}
+      - name: Deploy
+        run: amros dev docker run -dm --command="amros dev build deb"
 

.github/workflows/package.yml

@@ -13,28 +13,8 @@ jobs:
     steps:
       - uses: AutoModality/action-clean@v1.1.0
       - uses: actions/checkout@v2
-      - uses: rlespinasse/github-slug-action@3.1.0 # for GITHUB_REF_SLUG
-      - name: Package
-        id: package
-        uses: AutoModality/action-package-debian-ros@v5-amros
-        with:
-          branch: ${{ env.GITHUB_REF_SLUG }}
-          build-number: ${{ github.run_number }}
-          release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }}
-      - name: The generated package
-        run: echo "The artifact is ${{ steps.package.outputs.artifact-path }}"
       - name: Deploy
-        id: deploy
-        uses: AutoModality/action-cloudsmith@0.2.0
-        with:
-          api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
-          command: 'push'
-          format: 'deb'
-          owner: 'automodality'
-          repo: 'dev'
-          distro: 'ubuntu'
-          release: 'bionic'
-          file: '${{ steps.package.outputs.artifact-path }}'
+        run: amros dev docker run -dm --command="deploy-amros developer 0.0.${{ github.run_number }} dev ${{ secrets.CLOUDSMITH_API_KEY }}"
   draft-pr:
     runs-on: ubuntu-18.04
     needs: package
@@ -45,12 +25,3 @@ jobs:
         with:
           pr_draft: true
           github_token: ${{ secrets.GITHUB_TOKEN }}
-  # code-format:
-  #   runs-on: ubuntu-18.04
-  #   needs: package
-  #   steps:
-  #     - uses: actions/checkout@v2
-  #     - name: Format Code
-  #       uses: AutoModality/action-ros-clang-format@master
-  #       env:
-  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yml

@@ -9,10 +9,7 @@ env:
   RELEASE_PAYLOAD_FILE: release/payload.json
 jobs:
   release:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-18.04]
+    runs-on: ubuntu-18.04
     steps:
       - uses: AutoModality/action-clean@v1.1.0
       - name: Checkout
@@ -77,26 +74,10 @@ jobs:
         with:
           path: ${{ env.RELEASE_PROPERTIES_FILE }}
           property: 'version'
-      - name: Package if published
-        if: steps.published.outputs.value == 'true'
-        id: package
-        uses: AutoModality/action-package-debian-ros@v5-amros
-        with:
-          version: ${{ steps.version.outputs.value }}
-          release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }}
       - name: Deploy if published
         if: steps.published.outputs.value == 'true'
         id: deploy
-        uses: AutoModality/action-cloudsmith@0.2.0
-        with:
-          api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
-          command: 'push'
-          format: 'deb'
-          owner: 'automodality'
-          repo: 'release'
-          distro: 'ubuntu'
-          release: 'bionic'
-          file: '${{ steps.package.outputs.artifact-path }}'
+        run: amros dev docker run -dm --command="deploy-amros developer ${{ steps.version.outputs.value }} release ${{ secrets.CLOUDSMITH_API_KEY }}"
   notify-amros:
     needs: release-package
     runs-on: ubuntu-latest

debian/control

@@ -4,6 +4,7 @@ Priority: extra
 Maintainer: info <info@automodality.com>
 Build-Depends: debhelper (>= 9.0.0),
 	libjsoncpp-dev, 
+	opencv,
 	pcl,
 	ros-melodic-am-perception-pcl, 
     ros-melodic-am-control-toolbox, 
@@ -33,12 +34,13 @@ Package: ros-melodic-am-utils
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
 	libjsoncpp-dev,  
+	opencv,
 	pcl,
 	ros-melodic-am-perception-pcl, 
     ros-melodic-am-control-toolbox,
     ros-melodic-am-msgs,
     ros-melodic-am-platform-scripts,
-    ros-melodic-cv-bridge, 
+    ros-melodic-am-vision-opencv, 
     ros-melodic-geometry-msgs, 
     ros-melodic-image-transport,
     ros-melodic-mavros-msgs,