From 8a24d75b4f24a74aea5d841ac822e0c52a539053 Mon Sep 17 00:00:00 2001 From: Nick Satterly Date: Mon, 20 Mar 2023 08:48:46 +0100 Subject: [PATCH] Minor changes to standardize workflows --- .github/workflows/deploy.yml | 12 ++++-------- .github/workflows/release.yml | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 8b3cfef7..96c1d8a3 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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 }} @@ -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) }} @@ -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 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 07b17b51..02fdafcf 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -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) }} @@ -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) }}