Skip to content

Commit b163163

Browse files
author
Aaron Roller
authored
Merge pull request #59 from AutoModality/AM-772/deploy
updated to use docker cli AM-772/deploy
2 parents cabb604 + 3515b22 commit b163163

File tree

4 files changed

+7
-99
lines changed

4 files changed

+7
-99
lines changed

.github/workflows/docs.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/workflows/package.yml

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,42 +13,15 @@ jobs:
1313
steps:
1414
- uses: AutoModality/action-clean@v1.1.0
1515
- uses: actions/checkout@v2
16-
- uses: rlespinasse/github-slug-action@3.1.0 # for GITHUB_REF_SLUG
17-
- name: Package
18-
id: package
19-
uses: AutoModality/action-package-debian-ros@v5-amros
20-
with:
21-
branch: ${{ env.GITHUB_REF_SLUG }}
22-
build-number: ${{ github.run_number }}
23-
release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }}
24-
- name: The generated package
25-
run: echo "The artifact is ${{ steps.package.outputs.artifact-path }}"
2616
- name: Deploy
27-
id: deploy
28-
uses: AutoModality/action-cloudsmith@0.2.0
29-
with:
30-
api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
31-
command: 'push'
32-
format: 'deb'
33-
owner: 'automodality'
34-
repo: 'dev'
35-
distro: 'ubuntu'
36-
release: 'bionic'
37-
file: '${{ steps.package.outputs.artifact-path }}'
38-
merge-pr:
39-
name: Success. Merge to master
17+
run: amros dev docker run -dm --command="deploy-amros developer 0.0.${{ github.run_number }} dev ${{ secrets.CLOUDSMITH_API_KEY }}"
18+
draft-pr:
4019
runs-on: ubuntu-18.04
4120
needs: package
4221
steps:
4322
- uses: actions/checkout@v2
44-
- name: Create a Pull Request
23+
- name: Draft a Pull Request
4524
uses: repo-sync/pull-request@v2
4625
with:
47-
pr_draft: false
48-
github_token: ${{ secrets.AMGITBOT_PAT }}
49-
- name: Merge PR to master
50-
uses: ridedott/merge-me-action@master
51-
with:
52-
GITHUB_LOGIN: amgitbot
53-
GITHUB_TOKEN: ${{ secrets.AMGITBOT_PAT }}
54-
MERGE_METHOD: MERGE
26+
pr_draft: true
27+
github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pr-updater.yml

Lines changed: 0 additions & 17 deletions
This file was deleted.

.github/workflows/release.yml

Lines changed: 2 additions & 21 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
@@ -77,26 +74,10 @@ jobs:
7774
with:
7875
path: ${{ env.RELEASE_PROPERTIES_FILE }}
7976
property: 'version'
80-
- name: Package if published
81-
if: steps.published.outputs.value == 'true'
82-
id: package
83-
uses: AutoModality/action-package-debian-ros@v5-amros
84-
with:
85-
version: ${{ steps.version.outputs.value }}
86-
release-repo-entitlement: ${{ secrets.CLOUDSMITH_READ_RELEASE_ENTITLEMENT }}
8777
- name: Deploy if published
8878
if: steps.published.outputs.value == 'true'
8979
id: deploy
90-
uses: AutoModality/action-cloudsmith@0.2.0
91-
with:
92-
api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
93-
command: 'push'
94-
format: 'deb'
95-
owner: 'automodality'
96-
repo: 'release'
97-
distro: 'ubuntu'
98-
release: 'bionic'
99-
file: '${{ steps.package.outputs.artifact-path }}'
80+
run: amros dev docker run -dm --command="deploy-amros developer ${{ steps.version.outputs.value }} release ${{ secrets.CLOUDSMITH_API_KEY }}"
10081
notify-amros:
10182
needs: release-package
10283
runs-on: ubuntu-latest

0 commit comments

Comments
 (0)