Skip to content

Commit bcb76ab

Browse files
author
Aaron Roller
authored
Merge pull request #58 from AutoModality/AM-498/amros-docker
packaging in current dir necessary for amros AM-498/amros-docker
2 parents d3e92eb + b8ea5e3 commit bcb76ab

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

.github/workflows/nightly.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- uses: actions/checkout@v2
1010
- name: Package
1111
id: package
12-
uses: AutoModality/action-package-debian-ros@v4
12+
uses: AutoModality/action-package-debian-ros@v5-ros
1313
with:
1414
release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }}
1515

.github/workflows/package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: rlespinasse/github-slug-action@2.0.0 # for GITHUB_REF_SLUG
1717
- name: Package
1818
id: package
19-
uses: AutoModality/action-package-debian-ros@v4
19+
uses: AutoModality/action-package-debian-ros@v5-amros
2020
with:
2121
branch: ${{ env.GITHUB_REF_SLUG }}
2222
build-number: ${{ github.run_number }}

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
- name: Package if published
8181
if: steps.published.outputs.value == 'true'
8282
id: package
83-
uses: AutoModality/action-package-debian-ros@v4
83+
uses: AutoModality/action-package-debian-ros@v5-amros
8484
with:
8585
version: ${{ steps.version.outputs.value }}
8686
release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }}

debian/rules

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,9 @@ override_dh_auto_install:
5656
# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
5757
if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \
5858
dh_auto_install
59+
60+
override_dh_builddeb:
61+
# write debian package to current directory
62+
# amros container causes cross-link error when up one directory
63+
dh_builddeb --destdir=.
64+

0 commit comments

Comments
 (0)