Skip to content

Commit e6f3881

Browse files
author
Aaron Roller
authored
Merge pull request #8 from AutoModality/BB-790/dockerfile-package
Now being built by more efficient package action
2 parents b96b7f2 + a633795 commit e6f3881

File tree

12 files changed

+246
-26
lines changed

12 files changed

+246
-26
lines changed

‎.github/workflows/package.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
token: ${{secrets.github_token}}
1616
- name: Package
1717
id: package
18-
uses: AutoModality/action-package-debian-ros@v1.1.0
18+
uses: AutoModality/action-package-debian-ros@v1.1.1
1919
with:
2020
branch: ${{ github.event.pull_request.head.ref }}
2121
pull-request-number: ${{ github.event.number }}

‎.github/workflows/release.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,13 @@ jobs:
1414
with:
1515
semantic_version: 15.14.0
1616
extra_plugins: |
17-
@semantic-release/git
1817
@semantic-release/changelog@3.0.0
1918
env:
2019
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2120
- name: Package
2221
if: steps.semantic.outputs.new_release_published == 'true'
2322
id: package
24-
uses: AutoModality/action-package-debian-ros@v1.1.0
23+
uses: AutoModality/action-package-debian-ros@v1.1.1
2524
with:
2625
version: ${{ steps.semantic.outputs.new_release_version }}
2726
- name: The generated package

‎.github/workflows/story.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ jobs:
99
runs-on: ubuntu-16.04
1010
steps:
1111
- uses: actions/checkout@v1
12-
- name: make
13-
uses: AutoModality/action-make-ros@v1.0.0
12+
- name: Package
13+
uses: AutoModality/action-package-debian-ros@v1.1.1
14+
1415

‎.gitignore‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
# Prerequisites
2+
*.d
3+
4+
# Compiled Object files
5+
*.slo
6+
*.lo
7+
*.o
8+
*.obj
9+
10+
# Precompiled Headers
11+
*.gch
12+
*.pch
13+
14+
# Compiled Dynamic libraries
15+
*.so
16+
*.dylib
17+
*.dll
18+
19+
# Fortran module files
20+
*.mod
21+
*.smod
22+
23+
# Compiled Static libraries
24+
*.lai
25+
*.la
26+
*.a
27+
*.lib
28+
29+
# Executables
30+
*.exe
31+
*.out
32+
*.app
33+
34+
35+
catkin_ws
36+
debian/ros-kinetic-*.debhelper.log
37+
debian/ros-kinetic-am-utils*
38+
debian/debhelper-build-stamp
39+
debian/source

‎CHANGELOG.rst‎

Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
v1.0.1 (2020-01-06)
2+
------------
3+
- Adding changelog for original release feature/BB-772. [Jimi Damon]
4+
5+
6+
v1.0.0 (2020-01-05)
7+
-------------------
8+
- Merge pull request #3 from AutoModality/feature/BB-772. [Aaron Roller]
9+
10+
realease config needed to avoid node dependency feature/BB-772
11+
- Realease config needed to avoid node dependency feature/BB-772. [Aaron
12+
Roller]
13+
- Merge pull request #1 from AutoModality/feature/BB-772. [Aaron Roller]
14+
15+
BB-772 Added Github Actions Make, Package, Release
16+
- Feat: added Actions following the standard release process
17+
feature/BB-772. [Aaron Roller]
18+
- Added package and release feature/BB-772. [Aaron Roller]
19+
- Fixing regex feature/BB-772. [Jimi Damon]
20+
- Adding this branch feature/BB-772. [Jimi Damon]
21+
- Adding story workflow feature/BB-772. [Jimi Damon]
22+
- Removing build.yml feature/BB-772. [Jimi Damon]
23+
- Trying out build using @arollers build feature/BB-772. [Jimi Damon]
24+
- Still Trying out fixes with build.yml feature/BB-772. [Jimi Damon]
25+
- Still Trying out fixes with build.yml feature/BB-772. [Jimi Damon]
26+
- Still Trying out fixes with build.yml feature/BB-772. [Jimi Damon]
27+
- Trying out fixes with build.yml feature/BB-772. [Jimi Damon]
28+
- Adding github workflow feature/BB-772. [Jimi Damon]
29+
- Debian information for packages feature/BB-772. [Jimi Damon]
30+
- Ground removal. [Unknown]
31+
32+
33+
demo_2019_02_25 (2019-02-09)
34+
-----------------
35+
36+
New
37+
~~~
38+
- New Delay statistics message and online statistics algorithms
39+
calculations. [Jimi Damon]
40+
41+
- allows mean and variance to be calculated incrementally when new data points come in
42+
- we can keep a sliding window of number of points to use for our mean and var calculations
43+
- resolved merge conflicts with taos checkin
44+
45+
TMP
46+
- Add CAN socket. [Tao Wang]
47+
48+
Other
49+
~~~~~
50+
- New topics for dji_sdk gimbal. [Unknown]
51+
- Correct dji_sdk topics. [dan hennage]
52+
- More vision topic fixes. [dan hennage]
53+
- Fixed the naming bug in sensor camera topics. [dan hennage]
54+
- Successfull build. [ubuntu]
55+
- More dji_vision related topics and services. [ubuntu]
56+
- Topics for dji vision. [ubuntu]
57+
- Topic for Battery_state. [ubuntu]
58+
- Distance/agl_lw. [dan hennage]
59+
- Added ouster topics. [dan hennage]
60+
- Add LED blink topic. [ubuntu]
61+
- Added topics. [dan hennage]
62+
- Set addr.can_family before ioctl. [Jimi Damon]
63+
- Release CAN key when read fail. [dan hennage]
64+
- :sparkles: Fixes for creating an installable library. [Jimi Damon]
65+
- More user friendly message that includes stddev instead of variance.
66+
[Jimi Damon]
67+
- Revise the header macro for CAN socket. [Tao Wang]
68+
- Added topics. [dan hennage]
69+
- Latency_wrapper.h bug fix. [ubuntu]
70+
- Fix on latency_wrapper. [ubuntu]
71+
- Added sc1 topics. [dan hennage]
72+
- Changed to strings. [dan hennage]
73+
74+

‎CMakeLists.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ find_package(catkin REQUIRED COMPONENTS
77
nav_msgs
88
genmsg
99
std_msgs
10-
sensor_msgs)
10+
sensor_msgs
11+
rosconsole
12+
rostime
13+
)
1114

1215
add_message_files(
1316
DIRECTORY msg

‎Makefile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
SHELL := /bin/bash
2+
3+
default:
4+
source /opt/ros/kinetic/setup.bash && cd catkin_ws && catkin clean -f -i -y && catkin build -j3
5+
rm -f catkin_ws/install/lib/pkgconfig/catkin_tools_prebuild.pc
6+
@echo "Built!!!!"
7+
8+
install:
9+
rm -rf catkin_ws/install/share/catkin_tools_prebuild
10+
install -d $(DESTDIR)/opt/ros/kinetic/
11+
cp -f -p -r catkin_ws/install/lib $(DESTDIR)/opt/ros/kinetic
12+
cp -f -p -r catkin_ws/install/share $(DESTDIR)/opt/ros/kinetic
13+
cp -f -p -r catkin_ws/install/include $(DESTDIR)/opt/ros/kinetic
14+
15+
16+
clean:
17+
@echo "Cleaning"
18+
rm -rf catkin_ws

‎README.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,30 @@ A common library for sharing core code.
1010
| [![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/)|
1111

1212

13+
## Run in Docker
14+
15+
Mounts your local clone of this repository to `/workspace` directory in a docker container.
16+
17+
**Prerequisites**
18+
* Docker is installed
19+
* This repository is cloned
20+
* Your current directory is the root of this repository
21+
22+
```
23+
docker run -w /workspace -v `pwd`:/workspace -it docker.cloudsmith.io/automodality/dev/amros-base
24+
```
25+
26+
## Build
27+
28+
Build with debian in docker.
29+
30+
```
31+
32+
33+
## Package
34+
35+
Runs `Build` and packages for installation.
36+
1337
## Releases
1438
1539
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).

‎configure‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
PACKAGE=am-utils
3+
source /opt/ros/kinetic/setup.bash
4+
echo "We are $(pwd)"
5+
CURDIR=$(readlink -f $(pwd))
6+
mkdir -p catkin_ws/src/${PACKAGE}
7+
WORKSPACE=$(readlink -f ./catkin_ws)
8+
cp -r src catkin_ws/src/${PACKAGE}
9+
cp -r include catkin_ws/src/${PACKAGE}
10+
cp -r test catkin_ws/src/${PACKAGE}
11+
cp -r msg catkin_ws/src/${PACKAGE}
12+
cp package.xml catkin_ws/src/${PACKAGE}
13+
cp CMakeLists.txt catkin_ws/src/${PACKAGE}
14+
cd catkin_ws
15+
catkin init --workspace .
16+
echo "PWD: $(pwd)"
17+
catkin config --install
18+

‎debian/control‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
Source: ros-kinetic-am-utils
2-
Section: unknown
2+
Section: misc
33
Priority: extra
4-
Maintainer: Jimi Damon <jdamon@automodality.com>
5-
Build-Depends: cmake, debhelper (>=9),javahelper
6-
Standards-Version: 3.9.6
7-
Homepage: <insert the upstream URL, if relevant>
4+
Maintainer: info <info@automodality.com>
5+
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
6+
Homepage: https://github.com/AutoModality/am-utils
7+
Standards-Version: 3.9.2
88

99
Package: ros-kinetic-am-utils
1010
Architecture: any
11-
Multi-Arch: foreign
12-
Depends: ${misc:Depends}, ${shlibs:Depends}
13-
Description: Utilites for AM based ROs packages
11+
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
12+
Description: The am utils package

0 commit comments

Comments
 (0)