Skip to content

Commit 08fe620

Browse files
author
Aaron Roller
authored
Merge pull request #81 from AutoModality/AM-772/deploy_cuda
ci: wrong secret AM-772/deploy_cuda
2 parents f0e751b + 277c9ba commit 08fe620

File tree

4 files changed

+58
-16
lines changed

4 files changed

+58
-16
lines changed

.github/workflows/nightly.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: Nightly
22
on:
3+
schedule:
4+
- cron: '05 05 * * *'
35
push:
46
branches-ignore:
57
- master

.github/workflows/package.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,35 @@ on:
33
push:
44
branches-ignore:
55
- master
6+
env:
7+
DEPLOY_COMMAND: deploy-amros ${{ secrets.DEVELOPER_PASSWORD }} 0.0.${{ github.run_number }} dev ${{ secrets.CLOUDSMITH_API_KEY }}
68
jobs:
79
package:
8-
runs-on: ${{ matrix.os }}
9-
strategy:
10-
matrix:
11-
os: [[x64, self-hosted,linux,build], [arm64,self-hosted,linux, build]]
12-
fail-fast: false
10+
runs-on: [x64, self-hosted,linux,build]
1311
steps:
1412
- uses: AutoModality/action-clean@v1.1.0
1513
- uses: actions/checkout@v2
1614
- name: Deploy
17-
run: amros dev docker run -dm --command="deploy-amros developer 0.0.${{ github.run_number }} dev ${{ secrets.CLOUDSMITH_API_KEY }}"
15+
id: deploy
16+
run: amros dev docker run -dm --command="${{ env.DEPLOY_COMMAND }}"
17+
package-arm:
18+
runs-on: [arm64,self-hosted,linux, cuda]
19+
steps:
20+
- uses: AutoModality/action-clean@v1.1.0
21+
- uses: actions/checkout@v2
22+
- name: Deploy
23+
id: deploy
24+
run: ${{ env.DEPLOY_COMMAND }}
1825
draft-pr:
1926
runs-on: ubuntu-18.04
20-
needs: package
27+
needs:
28+
- package
29+
- package-arm
2130
steps:
2231
- uses: actions/checkout@v2
2332
- name: Draft a Pull Request
2433
uses: repo-sync/pull-request@v2
2534
with:
2635
pr_draft: true
2736
github_token: ${{ secrets.GITHUB_TOKEN }}
37+

.github/workflows/release.yml

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ env:
99
RELEASE_PAYLOAD_FILE: release/payload.json
1010
jobs:
1111
release:
12-
runs-on: ubuntu-18.04
12+
runs-on: ${{ matrix.os }}
13+
strategy:
14+
matrix:
15+
os: [ubuntu-18.04]
1316
steps:
1417
- uses: AutoModality/action-clean@v1.1.0
1518
- name: Checkout
@@ -46,11 +49,7 @@ jobs:
4649
path: '${{ env.RELEASE_DIR }}'
4750
release-package:
4851
needs: release
49-
runs-on: ${{ matrix.os }}
50-
strategy:
51-
matrix:
52-
os: [[x64, self-hosted,linux,build], [arm64,self-hosted,linux, build]]
53-
fail-fast: true
52+
runs-on: [x64, self-hosted,linux,build]
5453
name: Package if released
5554
steps:
5655
- uses: AutoModality/action-clean@v1.1.0
@@ -77,9 +76,39 @@ jobs:
7776
- name: Deploy if published
7877
if: steps.published.outputs.value == 'true'
7978
id: deploy
80-
run: amros dev docker run -dm --command="deploy-amros developer ${{ steps.version.outputs.value }} release ${{ secrets.CLOUDSMITH_API_KEY }}"
79+
run: amros dev docker run -dm --command="deploy-amros ${{ secrets.DEVELOPER_PASSWORD }} ${{ steps.version.outputs.value }} release ${{ secrets.CLOUDSMITH_API_KEY }}"
80+
release-package-arm:
81+
needs: release
82+
runs-on: [arm64,self-hosted,linux, cuda]
83+
steps:
84+
- uses: AutoModality/action-clean@v1.1.0
85+
- uses: actions/checkout@v2
86+
- name: Download release
87+
uses: actions/download-artifact@v1
88+
with:
89+
name: release
90+
path: ${{ env.RELEASE_DIR }}
91+
- name: Read Published
92+
id: published
93+
uses: christian-draeger/read-properties@1.0.1
94+
with:
95+
path: ${{ env.RELEASE_PROPERTIES_FILE }}
96+
property: 'published'
97+
- name: Read Version if published
98+
id: version
99+
if: steps.published.outputs.value == 'true'
100+
uses: christian-draeger/read-properties@1.0.1
101+
with:
102+
path: ${{ env.RELEASE_PROPERTIES_FILE }}
103+
property: 'version'
104+
- name: Deploy
105+
id: deploy
106+
if: steps.published.outputs.value == 'true'
107+
run: deploy-amros ${{ secrets.DEVELOPER_PASSWORD }} ${{ steps.version.outputs.value }} release ${{ secrets.CLOUDSMITH_API_KEY }}
81108
notify-amros:
82-
needs: release-package
109+
needs:
110+
- release-package
111+
- release-package-arm
83112
runs-on: ubuntu-latest
84113
name: Notify AMROS
85114
steps:

debian/rules

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,9 @@ override_dh_shlibdeps:
4747
# In case we're installing to a non-standard location, look for a setup.sh
4848
# in the install tree that was dropped by catkin, and source it. It will
4949
# set things like CMAKE_PREFIX_PATH, PKG_CONFIG_PATH, and PYTHONPATH.
50+
# ignore dependency checking since opencv4 comes with Nvidia NX
5051
if [ -f "/opt/ros/melodic/setup.sh" ]; then . "/opt/ros/melodic/setup.sh"; fi && \
51-
dh_shlibdeps -l$(CURDIR)/debian/ros-melodic-am-utils//opt/ros/melodic/lib/
52+
dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info -l$(CURDIR)/debian/ros-melodic-am-utils//opt/ros/melodic/lib/
5253

5354
override_dh_auto_install:
5455
# In case we're installing to a non-standard location, look for a setup.sh

0 commit comments

Comments
 (0)