From 5ab4ba73819924ad2f2cf6b77efefd5a5f848c29 Mon Sep 17 00:00:00 2001 From: Jimi Damon Date: Mon, 6 Jan 2020 18:16:05 -0800 Subject: [PATCH 01/19] Adding changelog for original release feature/BB-772 --- CHANGELOG.rst | 42 ++++++++++++++++++++++++++++++++++++++++++ package.xml | 2 +- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 CHANGELOG.rst diff --git a/CHANGELOG.rst b/CHANGELOG.rst new file mode 100644 index 0000000..c56a2e0 --- /dev/null +++ b/CHANGELOG.rst @@ -0,0 +1,42 @@ +demo_2019_02_25 (2019-02-09) +----------------- + +New +~~~ +- New Delay statistics message and online statistics algorithms + calculations. [Jimi Damon] + + - allows mean and variance to be calculated incrementally when new data points come in + - we can keep a sliding window of number of points to use for our mean and var calculations + - resolved merge conflicts with taos checkin + + TMP +- Add CAN socket. [Tao Wang] + +Other +~~~~~ +- New topics for dji_sdk gimbal. [Unknown] +- Correct dji_sdk topics. [dan hennage] +- More vision topic fixes. [dan hennage] +- Fixed the naming bug in sensor camera topics. [dan hennage] +- Successfull build. [ubuntu] +- More dji_vision related topics and services. [ubuntu] +- Topics for dji vision. [ubuntu] +- Topic for Battery_state. [ubuntu] +- Distance/agl_lw. [dan hennage] +- Added ouster topics. [dan hennage] +- Add LED blink topic. [ubuntu] +- Added topics. [dan hennage] +- Set addr.can_family before ioctl. [Jimi Damon] +- Release CAN key when read fail. [dan hennage] +- :sparkles: Fixes for creating an installable library. [Jimi Damon] +- More user friendly message that includes stddev instead of variance. + [Jimi Damon] +- Revise the header macro for CAN socket. [Tao Wang] +- Added topics. [dan hennage] +- Latency_wrapper.h bug fix. [ubuntu] +- Fix on latency_wrapper. [ubuntu] +- Added sc1 topics. [dan hennage] +- Changed to strings. [dan hennage] + + diff --git a/package.xml b/package.xml index 6664b68..d13108b 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ am_utils - 0.0.0 + 1.0.0 The am utils package info BSD From af887827c88a8c28a11bcfdeb231b060eeb4f746 Mon Sep 17 00:00:00 2001 From: Jimi Damon Date: Mon, 6 Jan 2020 18:22:25 -0800 Subject: [PATCH 02/19] Fix Changelog includes log and commit messages feature/BB-772 --- CHANGELOG.rst | 32 ++++++++++++++++++++++++++++++++ package.xml | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index c56a2e0..44f57da 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,3 +1,35 @@ +(unreleased) +------------ +- Adding changelog for original release feature/BB-772. [Jimi Damon] + + +v1.0.0 (2020-01-05) +------------------- +- Merge pull request #3 from AutoModality/feature/BB-772. [Aaron Roller] + + realease config needed to avoid node dependency feature/BB-772 +- Realease config needed to avoid node dependency feature/BB-772. [Aaron + Roller] +- Merge pull request #1 from AutoModality/feature/BB-772. [Aaron Roller] + + BB-772 Added Github Actions Make, Package, Release +- Feat: added Actions following the standard release process + feature/BB-772. [Aaron Roller] +- Added package and release feature/BB-772. [Aaron Roller] +- Fixing regex feature/BB-772. [Jimi Damon] +- Adding this branch feature/BB-772. [Jimi Damon] +- Adding story workflow feature/BB-772. [Jimi Damon] +- Removing build.yml feature/BB-772. [Jimi Damon] +- Trying out build using @arollers build feature/BB-772. [Jimi Damon] +- Still Trying out fixes with build.yml feature/BB-772. [Jimi Damon] +- Still Trying out fixes with build.yml feature/BB-772. [Jimi Damon] +- Still Trying out fixes with build.yml feature/BB-772. [Jimi Damon] +- Trying out fixes with build.yml feature/BB-772. [Jimi Damon] +- Adding github workflow feature/BB-772. [Jimi Damon] +- Debian information for packages feature/BB-772. [Jimi Damon] +- Ground removal. [Unknown] + + demo_2019_02_25 (2019-02-09) ----------------- diff --git a/package.xml b/package.xml index d13108b..3843e23 100644 --- a/package.xml +++ b/package.xml @@ -1,7 +1,7 @@ am_utils - 1.0.0 + 1.0.1 The am utils package info BSD From c7a8e408e0acf432adf6f7948dde8be84d52aa22 Mon Sep 17 00:00:00 2001 From: Jimi Damon Date: Mon, 6 Jan 2020 19:34:38 -0800 Subject: [PATCH 03/19] changelog and build fixes for building debian package feature/BB-772 --- CHANGELOG.rst | 2 +- CMakeLists.txt | 5 +++- Makefile | 17 ++++++++++++++ configure | 18 +++++++++++++++ debian/control | 15 ++++++------ debian/rules | 63 ++++++++++++++++++++++++++++++++++++++++++-------- package.xml | 4 +++- 7 files changed, 103 insertions(+), 21 deletions(-) create mode 100644 Makefile create mode 100755 configure diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 44f57da..7e89915 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,4 +1,4 @@ -(unreleased) +v1.0.1 (2020-01-06) ------------ - Adding changelog for original release feature/BB-772. [Jimi Damon] diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fef647..48db159 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,10 @@ find_package(catkin REQUIRED COMPONENTS nav_msgs genmsg std_msgs - sensor_msgs) + sensor_msgs + rosconsole + rostime + ) add_message_files( DIRECTORY msg diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e7ee31c --- /dev/null +++ b/Makefile @@ -0,0 +1,17 @@ +SHELL := /bin/bash + +default: + source /opt/ros/kinetic/setup.bash && cd catkin_ws && catkin clean -f -i -y && catkin build -j3 + @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 + + +clean: + @echo "Cleaning" + rm -rf catkin_ws diff --git a/configure b/configure new file mode 100755 index 0000000..9671601 --- /dev/null +++ b/configure @@ -0,0 +1,18 @@ +#!/bin/bash +PACKAGE=am-utils +source /opt/ros/kinetic/setup.bash +echo "We are $(pwd)" +CURDIR=$(readlink -f $(pwd)) +mkdir -p catkin_ws/src/${PACKAGE} +WORKSPACE=$(readlink -f ./catkin_ws) +cp -r src catkin_ws/src/${PACKAGE} +cp -r include catkin_ws/src/${PACKAGE} +cp -r test catkin_ws/src/${PACKAGE} +cp -r msg catkin_ws/src/${PACKAGE} +cp package.xml catkin_ws/src/${PACKAGE} +cp CMakeLists.txt catkin_ws/src/${PACKAGE} +cd catkin_ws +catkin init --workspace . +echo "PWD: $(pwd)" +catkin config --install + diff --git a/debian/control b/debian/control index d453732..6ac92b7 100644 --- a/debian/control +++ b/debian/control @@ -1,13 +1,12 @@ Source: ros-kinetic-am-utils -Section: unknown +Section: misc Priority: extra -Maintainer: Jimi Damon -Build-Depends: cmake, debhelper (>=9),javahelper -Standards-Version: 3.9.6 -Homepage: +Maintainer: info +Build-Depends: debhelper (>= 9.0.0), ros-kinetic-catkin, ros-kinetic-geometry-msgs, ros-kinetic-message-generation, ros-kinetic-nav-msgs, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs +Homepage: https://github.com/AutoModality/am-utils +Standards-Version: 3.9.2 Package: ros-kinetic-am-utils Architecture: any -Multi-Arch: foreign -Depends: ${misc:Depends}, ${shlibs:Depends} -Description: Utilites for AM based ROs packages +Depends: ${shlibs:Depends}, ${misc:Depends}, ros-kinetic-geometry-msgs, ros-kinetic-message-runtime, ros-kinetic-nav-msgs, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs +Description: The am utils package diff --git a/debian/rules b/debian/rules index 24150db..812918d 100755 --- a/debian/rules +++ b/debian/rules @@ -1,15 +1,58 @@ #!/usr/bin/make -f -# You must remove unused comment lines for the released package. -#export DH_VERBOSE = 1 -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all -#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic -#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -#export JAVA_HOME=/usr/lib/jvm/default-java -#export CLASSPATH=/usr/share/java/csv.jar:/usr/share/java/debug-disable.jar:/usr/share/java/itext.jar +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +export DH_VERBOSE=1 +# TODO: remove the LDFLAGS override. It's here to avoid esoteric problems +# of this sort: +# 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 +# Explicitly enable -DNDEBUG, see: +# https://github.com/ros-infrastructure/bloom/issues/327 +export DEB_CXXFLAGS_MAINT_APPEND=-DNDEBUG %: dh $@ -#override_dh_auto_configure: -# dh_auto_configure -- \ -# -DCMAKE_LIBRARY_ARCHITECTURE="$(DEB_TARGET_MULTIARCH)" +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 && \ + 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 && \ + 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 && \ + 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/ + +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 && \ + dh_auto_install diff --git a/package.xml b/package.xml index 3843e23..ce7681b 100644 --- a/package.xml +++ b/package.xml @@ -12,7 +12,9 @@ nav_msgs std_msgs sensor_msgs - + roscpp + rosconsole + rostime message_generation message_runtime From e2b5953bf38cfdedd711871c0225c028c21789cf Mon Sep 17 00:00:00 2001 From: Jimi Damon Date: Tue, 7 Jan 2020 06:59:58 -0800 Subject: [PATCH 04/19] experimenting with new make @local feature/BB-772 --- .github/actions/make@local/entrypoint.sh | 16 ++++++++-------- debian/control | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/actions/make@local/entrypoint.sh b/.github/actions/make@local/entrypoint.sh index 0e37170..2bcfa2a 100755 --- a/.github/actions/make@local/entrypoint.sh +++ b/.github/actions/make@local/entrypoint.sh @@ -4,11 +4,11 @@ set -e # fail on error cd /github/workspace -source /opt/ros/kinetic/setup.bash - -rm -rf build #clean the build -mkdir build -cd build -pwd -cmake .. -make \ No newline at end of file +dpkg-buildpackage -b -us -uc +# source /opt/ros/kinetic/setup.bash +# rm -rf build #clean the build +# mkdir build +# cd build +# pwd +# cmake .. +# make diff --git a/debian/control b/debian/control index 6ac92b7..89574b2 100644 --- a/debian/control +++ b/debian/control @@ -2,11 +2,11 @@ Source: ros-kinetic-am-utils Section: misc Priority: extra Maintainer: info -Build-Depends: debhelper (>= 9.0.0), ros-kinetic-catkin, ros-kinetic-geometry-msgs, ros-kinetic-message-generation, ros-kinetic-nav-msgs, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs +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 Homepage: https://github.com/AutoModality/am-utils Standards-Version: 3.9.2 Package: ros-kinetic-am-utils Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ros-kinetic-geometry-msgs, ros-kinetic-message-runtime, ros-kinetic-nav-msgs, ros-kinetic-sensor-msgs, ros-kinetic-std-msgs +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 Description: The am utils package From 0af9475a2abb1576f63bb456acdc9391333a7c06 Mon Sep 17 00:00:00 2001 From: Jimi Damon Date: Tue, 7 Jan 2020 07:04:01 -0800 Subject: [PATCH 05/19] Fixing build (again) feature/BB-772 --- .github/actions/make@local/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/make@local/entrypoint.sh b/.github/actions/make@local/entrypoint.sh index 2bcfa2a..3e492d6 100755 --- a/.github/actions/make@local/entrypoint.sh +++ b/.github/actions/make@local/entrypoint.sh @@ -4,7 +4,7 @@ set -e # fail on error cd /github/workspace -dpkg-buildpackage -b -us -uc +./debian/rules build # source /opt/ros/kinetic/setup.bash # rm -rf build #clean the build # mkdir build From f7fb58a244ebbdc97cbc9e052aeebb91a62ff228 Mon Sep 17 00:00:00 2001 From: Jimi Damon Date: Tue, 7 Jan 2020 07:20:57 -0800 Subject: [PATCH 06/19] Trying custom action feature/BB-772 --- .github/workflows/story.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index c6ff7ad..50fec88 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -12,5 +12,6 @@ jobs: steps: - uses: actions/checkout@v1 - name: make - uses: ./.github/actions/make@local + run: debian/rules build +#uses: ./.github/actions/make@local From 6432cff596f5c6aa863709dd5895f2aab1b5075a Mon Sep 17 00:00:00 2001 From: Jimi Damon Date: Tue, 7 Jan 2020 07:52:38 -0800 Subject: [PATCH 07/19] trying additional vm feature/BB-772 --- .github/workflows/story.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index 50fec88..6f5df44 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -10,6 +10,7 @@ jobs: build: runs-on: ubuntu-16.04 steps: + - uses: docker.cloudsmith.io/automodality/trial/amros-base:latest - uses: actions/checkout@v1 - name: make run: debian/rules build From fec11455134bf7092f6b02e07e466050c5d1ead6 Mon Sep 17 00:00:00 2001 From: Jimi Damon Date: Tue, 7 Jan 2020 07:57:42 -0800 Subject: [PATCH 08/19] new docker syntax feature/BB-772 --- .github/workflows/story.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index 6f5df44..689c7bf 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -10,7 +10,7 @@ jobs: build: runs-on: ubuntu-16.04 steps: - - uses: docker.cloudsmith.io/automodality/trial/amros-base:latest + - uses: docker://docker.cloudsmith.io/automodality/trial/amros-base:latest - uses: actions/checkout@v1 - name: make run: debian/rules build From d49936f3400020d8dcba125996d39ac603559bf4 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Tue, 7 Jan 2020 08:24:31 -0800 Subject: [PATCH 09/19] assigned the make to use the docker image feature/BB-772 --- .github/workflows/story.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index 7cde8db..d78367f 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -8,9 +8,9 @@ jobs: build: runs-on: ubuntu-16.04 steps: - - uses: docker://docker.cloudsmith.io/automodality/trial/amros-base:latest - uses: actions/checkout@v1 - name: make + uses: docker://docker.cloudsmith.io/automodality/trial/amros-base:latest run: debian/rules build #uses: ./.github/actions/make@local From 140abc29436a5eb5679f1979f6798598394e7ed2 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Tue, 7 Jan 2020 08:26:39 -0800 Subject: [PATCH 10/19] cannot have both uses and runs feature/BB-772 --- .github/workflows/story.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index d78367f..3ebec11 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -10,7 +10,6 @@ jobs: steps: - uses: actions/checkout@v1 - name: make - uses: docker://docker.cloudsmith.io/automodality/trial/amros-base:latest - run: debian/rules build + uses: docker://docker.cloudsmith.io/automodality/trial/amros-base:latest "debian/rules build" #uses: ./.github/actions/make@local From 458a9fd1fd233ebf7a11f55b26b851626438bd38 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Tue, 7 Jan 2020 08:35:23 -0800 Subject: [PATCH 11/19] went back to using the make. Updated the docker file to reference amros. feature/BB-772 --- .github/actions/make@local/Dockerfile | 2 +- .github/workflows/story.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/actions/make@local/Dockerfile b/.github/actions/make@local/Dockerfile index fc19f4a..b1c0d42 100644 --- a/.github/actions/make@local/Dockerfile +++ b/.github/actions/make@local/Dockerfile @@ -1,4 +1,4 @@ -FROM ros:kinetic-perception +FROM docker.cloudsmith.io/automodality/release/amros-base # Copies your code file from your action repository to the filesystem path `/` of the container COPY entrypoint.sh /entrypoint.sh diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index 3ebec11..69f7946 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -9,7 +9,6 @@ jobs: runs-on: ubuntu-16.04 steps: - uses: actions/checkout@v1 - - name: make - uses: docker://docker.cloudsmith.io/automodality/trial/amros-base:latest "debian/rules build" + - uses: ./.github/actions/make@local #uses: ./.github/actions/make@local From cebb702caa017627260ae57b8bb066c87ce1acbe Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Tue, 7 Jan 2020 08:38:44 -0800 Subject: [PATCH 12/19] using trial until auth is figured out feature/BB-772 --- .github/actions/make@local/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/make@local/Dockerfile b/.github/actions/make@local/Dockerfile index b1c0d42..e38ffd6 100644 --- a/.github/actions/make@local/Dockerfile +++ b/.github/actions/make@local/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.cloudsmith.io/automodality/release/amros-base +FROM docker.cloudsmith.io/automodality/trial/amros-base # Copies your code file from your action repository to the filesystem path `/` of the container COPY entrypoint.sh /entrypoint.sh From d032fbbd5f9b7badc8826e3f9588e25668ce4afa Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Tue, 7 Jan 2020 08:43:13 -0800 Subject: [PATCH 13/19] using just package feature/BB-772 --- .github/workflows/story.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index 69f7946..ad63013 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -9,6 +9,6 @@ jobs: runs-on: ubuntu-16.04 steps: - uses: actions/checkout@v1 - - uses: ./.github/actions/make@local -#uses: ./.github/actions/make@local + - name: Package + uses: AutoModality/action-package-debian-ros@v1.1.0 From b7e095babeb551bf03c703ac78301f09bf44c972 Mon Sep 17 00:00:00 2001 From: Jimi Damon Date: Tue, 7 Jan 2020 14:34:46 -0800 Subject: [PATCH 14/19] Fixed over intall of catkin_tools_prebuild feature/BB-772 --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e7ee31c..e3efa51 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,7 @@ SHELL := /bin/bash default: source /opt/ros/kinetic/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: @@ -9,7 +10,7 @@ install: 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 + cp -f -p -r catkin_ws/install/include $(DESTDIR)/opt/ros/kinetic clean: From f2af95a874f4e936eab0cff5a353bac26dbde7f2 Mon Sep 17 00:00:00 2001 From: Jimi Damon Date: Fri, 10 Jan 2020 13:49:55 -0800 Subject: [PATCH 15/19] Fixe for version of story feature/BB-772 feature/BB-772 --- .github/workflows/story.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index ad63013..6894606 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -10,5 +10,6 @@ jobs: steps: - uses: actions/checkout@v1 - name: Package - uses: AutoModality/action-package-debian-ros@v1.1.0 + uses: AutoModality/action-package-debian-ros@BB-780/control-depends + From f1e0fbeae1c0f4659086ed40ccef26039345908e Mon Sep 17 00:00:00 2001 From: Jimi Damon Date: Fri, 10 Jan 2020 13:51:33 -0800 Subject: [PATCH 16/19] Added ignore file feature/BB-772 feature/BB-772 --- .gitignore | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..ceb4d30 --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + + +catkin_ws +debian/ros-kinetic-*.debhelper.log +debian/changelog +debian/debhelper-build-stamp +debian/source \ No newline at end of file From e30c2b46645e89274fd781b90d216930424c7421 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Mon, 13 Jan 2020 11:11:48 -0800 Subject: [PATCH 17/19] added docs fixed a problem with release BB-790/dockerfile-package --- .github/workflows/release.yml | 1 - .gitignore | 39 +++++++++++++++++++++++++++++++++++ README.md | 24 +++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 .gitignore diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 272551b..2f59ebe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,6 @@ jobs: with: semantic_version: 15.14.0 extra_plugins: | - @semantic-release/git @semantic-release/changelog@3.0.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e9b2cc2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +# Prerequisites +*.d + +# Compiled Object files +*.slo +*.lo +*.o +*.obj + +# Precompiled Headers +*.gch +*.pch + +# Compiled Dynamic libraries +*.so +*.dylib +*.dll + +# Fortran module files +*.mod +*.smod + +# Compiled Static libraries +*.lai +*.la +*.a +*.lib + +# Executables +*.exe +*.out +*.app + + +catkin_ws +debian/ros-kinetic-*.debhelper.log +debian/debhelper-build-stamp +debian/source +debian/ros-kinetic-am-utils* diff --git a/README.md b/README.md index ade4d43..dce527a 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,30 @@ A common library for sharing core code. | [![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 +``` + +## Build + +Build with debian in docker. + +``` + + +## Package + +Runs `Build` and packages for installation. + ## Releases See [releases](https://github.com/AutoModality/am-utils/releases) for the latest. Follows the standard [Development Lifecycle](https://automodality.atlassian.net/wiki/spaces/AUTOMOD/pages/668664251/Development+Lifecycle). \ No newline at end of file From a3f39f148ca7af21acb1cb0716be96dc84f691c5 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Mon, 13 Jan 2020 12:57:14 -0800 Subject: [PATCH 18/19] building with amros dockerfile package BB-790/dockerfile-package --- .github/workflows/story.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index 6894606..7e86726 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -10,6 +10,8 @@ jobs: steps: - uses: actions/checkout@v1 - name: Package - uses: AutoModality/action-package-debian-ros@BB-780/control-depends + uses: AutoModality/action-package-debian-ros@BB-790/amros-dockerfile + with: + dev-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_DEV_ENTITLEMENT }} From a6337951cbe5c618391b50cd820a100e8679f0c4 Mon Sep 17 00:00:00 2001 From: Aaron Roller Date: Mon, 13 Jan 2020 13:31:45 -0800 Subject: [PATCH 19/19] updated to released version BB-790/dockerfile-package --- .github/workflows/package.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/story.yml | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index d84bdd7..4590d10 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -15,7 +15,7 @@ jobs: token: ${{secrets.github_token}} - name: Package id: package - uses: AutoModality/action-package-debian-ros@v1.1.0 + uses: AutoModality/action-package-debian-ros@v1.1.1 with: branch: ${{ github.event.pull_request.head.ref }} pull-request-number: ${{ github.event.number }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2f59ebe..b5525be 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - name: Package if: steps.semantic.outputs.new_release_published == 'true' id: package - uses: AutoModality/action-package-debian-ros@v1.1.0 + uses: AutoModality/action-package-debian-ros@v1.1.1 with: version: ${{ steps.semantic.outputs.new_release_version }} - name: The generated package diff --git a/.github/workflows/story.yml b/.github/workflows/story.yml index 7e86726..5098d6a 100644 --- a/.github/workflows/story.yml +++ b/.github/workflows/story.yml @@ -10,8 +10,6 @@ jobs: steps: - uses: actions/checkout@v1 - name: Package - uses: AutoModality/action-package-debian-ros@BB-790/amros-dockerfile - with: - dev-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_DEV_ENTITLEMENT }} + uses: AutoModality/action-package-debian-ros@v1.1.1