Skip to content

Commit 539c0f1

Browse files
author
Aaron Roller
authored
Merge pull request #148 from AutoModality/ci/1627591355
fix: updated github action workflows from am_msgs ci/1627591355
2 parents 6f160ec + 2bafd8a commit 539c0f1

2 files changed

Lines changed: 12 additions & 41 deletions

File tree

.github/workflows/package.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@ name: Release Candidate
22
on:
33
push:
44
branches-ignore:
5-
- master
6-
env:
7-
DEPLOY_COMMAND: deploy-amros ${{ secrets.DEVELOPER_PASSWORD }} 0.0.${{ github.run_number }} dev ${{ secrets.CLOUDSMITH_API_KEY }}
5+
- master
86
jobs:
97
package:
108
runs-on: [x64, self-hosted,linux,build]
119
steps:
1210
- uses: AutoModality/action-clean@v1.1.0
1311
- uses: actions/checkout@v2
12+
- uses: rlespinasse/github-slug-action@3.1.0
1413
- name: Deploy
1514
id: deploy
16-
run: amros dev docker run -dm --command="${{ env.DEPLOY_COMMAND }}"
15+
run: amros dev docker run -dm --command="deploy-amros ${{ secrets.DEVELOPER_PASSWORD }} ${{ github.run_number }}-${{ env.GITHUB_REF_SLUG }} dev ${{ secrets.CLOUDSMITH_API_KEY }}"
1716
package-arm:
1817
runs-on: [arm64,self-hosted,linux, cuda]
1918
steps:
2019
- uses: AutoModality/action-clean@v1.1.0
2120
- uses: actions/checkout@v2
21+
- uses: rlespinasse/github-slug-action@3.1.0
2222
- name: Deploy
2323
id: deploy
24-
run: ${{ env.DEPLOY_COMMAND }}
24+
run: deploy-amros ${{ secrets.DEVELOPER_PASSWORD }} ${{ github.run_number }}-${{ env.GITHUB_REF_SLUG }} dev ${{ secrets.CLOUDSMITH_API_KEY }}
2525
draft-pr:
2626
runs-on: ubuntu-18.04
2727
needs:

.github/workflows/release.yml

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,7 @@ env:
99
RELEASE_PAYLOAD_FILE: release/payload.json
1010
jobs:
1111
release:
12-
runs-on: ${{ matrix.os }}
13-
strategy:
14-
matrix:
15-
os: [ubuntu-18.04]
12+
runs-on: ubuntu-18.04
1613
steps:
1714
- uses: AutoModality/action-clean@v1.1.0
1815
- name: Checkout
@@ -49,7 +46,11 @@ jobs:
4946
path: '${{ env.RELEASE_DIR }}'
5047
release-package:
5148
needs: release
52-
runs-on: [x64, self-hosted,linux,build]
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
5354
name: Package if released
5455
steps:
5556
- uses: AutoModality/action-clean@v1.1.0
@@ -77,38 +78,8 @@ jobs:
7778
if: steps.published.outputs.value == 'true'
7879
id: deploy
7980
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 }}
10881
notify-amros:
109-
needs:
110-
- release-package
111-
- release-package-arm
82+
needs: release-package
11283
runs-on: ubuntu-latest
11384
name: Notify AMROS
11485
steps:

0 commit comments

Comments
 (0)