Merge pull request #12 from AutoModality/BB-800/melodic

Melodic

Author: Aaron Roller

.github/workflows/package.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v2
       - name: Package
         id: package
-        uses: AutoModality/action-package-debian-ros@v2.0.0
+        uses: AutoModality/action-package-debian-ros@v3.0.0
         with:
           branch: ${{ github.event.pull_request.head.ref }}
           pull-request-number: ${{ github.event.number }}
@@ -33,5 +33,5 @@ jobs:
           owner: 'automodality'
           repo: 'dev'
           distro: 'ubuntu'
-          release: 'xenial'
+          release: 'bionic'
           file: '${{ steps.package.outputs.artifact-path }}'

.github/workflows/release.yml

@@ -65,7 +65,7 @@ jobs:
       - name: Package if published
         if: steps.published.outputs.value == 'true'
         id: package
-        uses: AutoModality/action-package-debian-ros@v2.0.0
+        uses: AutoModality/action-package-debian-ros@v3.0.0
         with:
           version: ${{ steps.version.outputs.value }}
           release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }}
@@ -80,5 +80,5 @@ jobs:
           owner: 'automodality'
           repo: 'release'
           distro: 'ubuntu'
-          release: 'xenial'
+          release: 'bionic'
           file: '${{ steps.package.outputs.artifact-path }}'

.github/workflows/story.yml

@@ -10,10 +10,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Package
-        uses: AutoModality/action-package-debian-ros@v2.0.0
+        uses: AutoModality/action-package-debian-ros@v3.0.0
         with:
           dev-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_DEV_ENTITLEMENT }}
           release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }}
-        
+
 
 

.gitignore

@@ -33,10 +33,11 @@
 
 
 catkin_ws
-debian/ros-kinetic-*.debhelper.log
-debian/ros-kinetic-am-utils*
+debian/ros-*
 debian/debhelper-build-stamp
 debian/source
+debian/.debhelper
+ros-*-build-deps_*
 ros-*-am-utils-*
 debian/.debhelper
 debian/ros-*-am-utils*

Makefile

@@ -1,16 +1,16 @@
 SHELL := /bin/bash
 
 default:
-	source /opt/ros/kinetic/setup.bash && cd catkin_ws && catkin clean -f -i -y && catkin build -j3
+	source /opt/ros/melodic/setup.bash && cd catkin_ws && catkin clean -f -i -y && catkin build -j3
 	rm -f catkin_ws/install/lib/pkgconfig/catkin_tools_prebuild.pc
 	@echo "Built!!!!"
 
 install:
 	rm -rf catkin_ws/install/share/catkin_tools_prebuild
-	install -d $(DESTDIR)/opt/ros/kinetic/
-	cp -f -p -r catkin_ws/install/lib $(DESTDIR)/opt/ros/kinetic
-	cp -f -p -r catkin_ws/install/share $(DESTDIR)/opt/ros/kinetic
-	cp -f -p -r catkin_ws/install/include $(DESTDIR)/opt/ros/kinetic
+	install -d $(DESTDIR)/opt/ros/melodic/
+	cp -f -p -r catkin_ws/install/lib $(DESTDIR)/opt/ros/melodic
+	cp -f -p -r catkin_ws/install/share $(DESTDIR)/opt/ros/melodic
+	cp -f -p -r catkin_ws/install/include $(DESTDIR)/opt/ros/melodic
 
 
 clean:

README.md

@@ -3,36 +3,21 @@
 A common library for sharing core code.
 
 
-| Github Action  | Debian Package |
-| ------------- | ------------- |
+| Github Action  | Kinetic Package | Melodic Package |
+| ------------- | ------------- |  ------------- |
 | [![Story Development](https://github.com/AutoModality/am-utils/workflows/Story%20Development/badge.svg)](https://github.com/AutoModality/am-utils/actions?query=workflow%3A%22Story+Development%22) | --  |
-| [![Release Candidate](https://github.com/AutoModality/am-utils/workflows/Release%20Candidate/badge.svg)](https://github.com/AutoModality/am-utils/actions?query=workflow%3A%22Release+Candidate%22)  | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/badges/version/automodality/dev/deb/ros-kinetic-am-utils/latest/d=ubuntu%252Fxenial;t=1/?render=true&badge_token=gAAAAABeEXmnoIyJ49KZBuqu7owI69o58O-pEmDK1uXKcvR-65M3zvVldA6lRgnSlbOXlwUdmAwIYqjEaAIZ_K0DXuO7agbeqnAtp1uXvuwoxD6KMqz3wYQ%3D)](https://cloudsmith.io/~automodality/repos/dev/packages/detail/deb/ros-kinetic-am-utils/latest/d=ubuntu%252Fxenial;t=1/)  |
+| [![Release Candidate](https://github.com/AutoModality/am-utils/workflows/Release%20Candidate/badge.svg)](https://github.com/AutoModality/am-utils/actions?query=workflow%3A%22Release+Candidate%22)  | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/badges/version/automodality/dev/deb/ros-kinetic-am-utils/latest/d=ubuntu%252Fxenial;t=1/?render=true&badge_token=gAAAAABeEXmnoIyJ49KZBuqu7owI69o58O-pEmDK1uXKcvR-65M3zvVldA6lRgnSlbOXlwUdmAwIYqjEaAIZ_K0DXuO7agbeqnAtp1uXvuwoxD6KMqz3wYQ%3D)](https://cloudsmith.io/~automodality/repos/dev/packages/detail/deb/ros-kinetic-am-utils/latest/d=ubuntu%252Fxenial;t=1/)  | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/badges/version/automodality/dev/deb/ros-melodic-am-utils/latest/d=ubuntu%252Fbionic;t=1/?render=true&badge_token=gAAAAABeQHmJfRp7kwNLZ6HV9cXQCLx1oKm3MYDqMPtuUyZunep6ZjusRn_67muio5lDbumO-eW9_KvmoflqrAFGV-7LocdY0WJJ7UuRL9wa9nPzkYiHuxA%3D)](https://cloudsmith.io/~automodality/repos/dev/packages/detail/deb/ros-melodic-am-utils/latest/d=ubuntu%252Fbionic;t=1/) |
 | [![Release](https://github.com/AutoModality/am-utils/workflows/Release/badge.svg)](https://github.com/AutoModality/am-utils/actions?query=workflow%3A%22Release)  | [![Latest Version @ Cloudsmith](https://api-prd.cloudsmith.io/badges/version/automodality/release/deb/ros-kinetic-am-utils/latest/d=ubuntu%252Fxenial;t=1/?render=true&badge_token=gAAAAABeEYCXaXnvhWBdS0An17OCBntPch8LyCzJnPoQYMA4Ng8uIJnw2hvwdvv_NBqAOTu76_FBfvns72pfHrzV2xWoBFEvGA-hns2hV-4yu2BmqWtHCT0%3D)](https://cloudsmith.io/~automodality/repos/release/packages/detail/deb/ros-kinetic-am-utils/latest/d=ubuntu%252Fxenial;t=1/)|
 
 
 ## Run in Docker
 
-Mounts your local clone of this repository to `/workspace` directory in a docker container.
-
-**Prerequisites**
-* Docker is installed
-* This repository is cloned 
-* Your current directory is the root of this repository
-
-```
-docker run -w /workspace -v `pwd`:/workspace -it docker.cloudsmith.io/automodality/dev/amros-base
-debian/rules clean
-debian/rules build
-```
+See [AMROS](https://github.com/AutoModality/amros).
 
 ## Build
 
-Build with debian in docker.
-
-
-## Package 
+See [Package Action](https://github.com/AutoModality/action-package-debian-ros).
 
-Runs `Build` and packages for installation.
 
 ## Releases
 

configure

@@ -1,6 +1,6 @@
 #!/bin/bash
 PACKAGE=am-utils
-source /opt/ros/kinetic/setup.bash
+source /opt/ros/melodic/setup.bash
 echo "We are $(pwd)"
 CURDIR=$(readlink -f $(pwd))
 mkdir -p catkin_ws/src/${PACKAGE}

debian/changelog

@@ -1,4 +1,4 @@
-ros-kinetic-am-utils (999.9.9-local) unstable; urgency=low
+ros-melodic-am-utils (999.9.9-local) unstable; urgency=low
 
   [ Nobody ]
   * local changes only

debian/control

@@ -1,12 +1,33 @@
-Source: ros-kinetic-am-utils
+Source: ros-melodic-am-utils
 Section: misc
 Priority: extra
 Maintainer: info <info@automodality.com>
-Build-Depends: debhelper (>= 9.0.0), ros-kinetic-catkin, ros-kinetic-geometry-msgs, ros-kinetic-message-generation, ros-kinetic-nav-msgs, ros-kinetic-rosconsole, ros-kinetic-roscpp, ros-kinetic-rostime, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs, ros-kinetic-am-msgs, ros-kinetic-uuid-msgs
+Build-Depends: debhelper (>= 9.0.0), 
+    ros-melodic-am-msgs, 
+    ros-melodic-catkin, 
+    ros-melodic-geometry-msgs, 
+    ros-melodic-message-generation, 
+    ros-melodic-nav-msgs, 
+    ros-melodic-rosconsole, 
+    ros-melodic-roscpp, 
+    ros-melodic-rostime, 
+    ros-melodic-sensor-msgs, 
+    ros-melodic-std-msgs, 
+    ros-melodic-uuid-msgs,
 Homepage: https://github.com/AutoModality/am-utils
 Standards-Version: 3.9.2
 
-Package: ros-kinetic-am-utils
+Package: ros-melodic-am-utils
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ros-kinetic-geometry-msgs, ros-kinetic-message-runtime, ros-kinetic-nav-msgs, ros-kinetic-rosconsole, ros-kinetic-roscpp, ros-kinetic-rostime, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs, ros-kinetic-am-msgs, ros-kinetic-uuid-msgs
-Description: The am utils package
+Depends: ${shlibs:Depends}, ${misc:Depends}, 
+    ros-melodic-am-msgs, 
+    ros-melodic-geometry-msgs, 
+    ros-melodic-message-runtime, 
+    ros-melodic-nav-msgs, 
+    ros-melodic-rosconsole, 
+    ros-melodic-roscpp, 
+    ros-melodic-rostime, 
+    ros-melodic-sensor-msgs, 
+    ros-melodic-std-msgs, 
+    ros-melodic-uuid-msgs,
+Description: Common code to assist with AutoModality libraries found in separate repositories.

debian/rules

@@ -13,7 +13,7 @@ export DH_VERBOSE=1
 #  https://code.ros.org/trac/ros/ticket/2977
 #  https://code.ros.org/trac/ros/ticket/3842
 export LDFLAGS=
-export PKG_CONFIG_PATH=/opt/ros/kinetic/lib/pkgconfig
+export PKG_CONFIG_PATH=/opt/ros/melodic/lib/pkgconfig
 # Explicitly enable -DNDEBUG, see:
 # 	https://github.com/ros-infrastructure/bloom/issues/327
 export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG
@@ -25,34 +25,34 @@ override_dh_auto_configure:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
+	if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \
 	dh_auto_configure
 
 override_dh_auto_build:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
+	if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \
 	dh_auto_build
 
 override_dh_auto_test:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
 	echo -- Running tests. Even if one of them fails the build is not canceled.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
+	if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \
 	dh_auto_test || true
 
 override_dh_shlibdeps:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
-	dh_shlibdeps -l$(CURDIR)/debian/ros-kinetic-am-utils//opt/ros/kinetic/lib/
+	if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \
+	dh_shlibdeps -l$(CURDIR)/debian/ros-melodic-am-utils//opt/ros/melodic/lib/
 
 override_dh_auto_install:
 	# In case we're installing to a non-standard location, look for a setup.sh
 	# in the install tree that was dropped by catkin, and source it.  It will
 	# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
-	if [ -f "/opt/ros/kinetic/setup.sh" ]; then . "/opt/ros/kinetic/setup.sh"; fi && \
+	if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \
 	dh_auto_install