Skip to content

Commit

Permalink
Minor changes to standardize workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
satterly committed Mar 20, 2023
1 parent 9207a76 commit 8a24d75
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,9 @@ name: Deploy

on:
push:
branches:
- master
- 'release/**'
branches: [ master, release/* ]
pull_request:
branches:
- master
- 'release/**'
branches: [ master, release/* ]

env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
Expand All @@ -30,7 +26,7 @@ jobs:
- name: Unit Test
id: unit-test
run: npm run test:unit
- uses: act10ns/slack@v1
- uses: act10ns/slack@v2
with:
status: ${{ job.status }}
steps: ${{ toJson(steps) }}
Expand All @@ -50,7 +46,7 @@ jobs:
- run: |
echo BASE_URL=./ > .env
echo VUE_APP_ALERTA_ENDPOINT=https://alerta-api.fly.dev >> .env
echo VUE_APP_TRACKING_ID=UA-44644195-7 >> .env
echo VUE_APP_TRACKING_ID=UA-44644195-1 >> .env
- name: Build
id: build
run: npm run build
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
id: unit-test
run: npm run test:unit

- uses: act10ns/slack@v1
- uses: act10ns/slack@v2
with:
status: ${{ job.status }}
steps: ${{ toJson(steps) }}
Expand Down Expand Up @@ -81,7 +81,7 @@ jobs:
asset_name: alerta-webui.tar.gz
asset_content_type: application/gzip

- uses: act10ns/slack@v1
- uses: act10ns/slack@v2
with:
status: ${{ job.status }}
steps: ${{ toJson(steps) }}
Expand Down

0 comments on commit 8a24d75

Please sign in to comment.