From 2855bf7a63b2ce9c417d081bf69aed0602ccdf84 Mon Sep 17 00:00:00 2001 From: Hans Song Date: Tue, 16 Apr 2024 02:48:37 +1000 Subject: [PATCH] pass secret --- .github/workflows/_build.yml | 13 +++---------- .github/workflows/_deploy.yml | 8 +++----- .github/workflows/push-to-master.yml | 5 +++-- 3 files changed, 9 insertions(+), 17 deletions(-) diff --git a/.github/workflows/_build.yml b/.github/workflows/_build.yml index c32f82b..bb598ca 100644 --- a/.github/workflows/_build.yml +++ b/.github/workflows/_build.yml @@ -5,6 +5,9 @@ on: type: boolean description: whether or not to publish default: false + secrets: + AWS_ECR_IMAGE_PUBLISHER_ROLE_ARN: + required: true env: image: public.ecr.aws/axatol/huisheng @@ -22,16 +25,6 @@ jobs: with: show-progress: false - - uses: actions/setup-node@v4 - with: - node-version-file: .nvmrc - - - run: npm install - - - run: npm run lint - - - run: npm run compile - - uses: axatol/actions/assume-aws-role@release if: inputs.publish with: diff --git a/.github/workflows/_deploy.yml b/.github/workflows/_deploy.yml index db1f5ec..1db2122 100644 --- a/.github/workflows/_deploy.yml +++ b/.github/workflows/_deploy.yml @@ -4,9 +4,7 @@ on: workflow_dispatch: workflow_call: secrets: - DISCORD_GITHUB_ACTIONS_WEBHOOK_URL: - required: true - NEW_RELIC_API_KEY: + DISCORD_WEBHOOK_URL: required: true NEW_RELIC_DEPLOYMENT_ENTITY_GUID: required: true @@ -18,7 +16,7 @@ jobs: steps: - uses: axatol/actions/send-deployment-notification@release with: - webhook-url: ${{ secrets.DISCORD_GITHUB_ACTIONS_WEBHOOK_URL }} + webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }} job-status: pending deploy: @@ -50,5 +48,5 @@ jobs: if: success() || failure() uses: axatol/actions/send-discord-deployment-notification@release with: - webhook-url: ${{ secrets.DISCORD_GITHUB_ACTIONS_WEBHOOK_URL }} + webhook-url: ${{ secrets.DISCORD_WEBHOOK_URL }} status: ${{ steps.deploy.outcome }} diff --git a/.github/workflows/push-to-master.yml b/.github/workflows/push-to-master.yml index 60c27b3..a60dcbd 100644 --- a/.github/workflows/push-to-master.yml +++ b/.github/workflows/push-to-master.yml @@ -15,11 +15,12 @@ jobs: uses: ./.github/workflows/_build.yml with: publish: true + secrets: + AWS_ECR_IMAGE_PUBLISHER_ROLE_ARN: ${{ secrets.AWS_ECR_IMAGE_PUBLISHER_ROLE_ARN }} deploy: needs: build uses: ./.github/workflows/_deploy.yml secrets: - DISCORD_GITHUB_ACTIONS_WEBHOOK_URL: ${{ secrets.DISCORD_GITHUB_ACTIONS_WEBHOOK_URL }} - NEW_RELIC_API_KEY: ${{ secrets.NEW_RELIC_API_KEY }} + DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }} NEW_RELIC_DEPLOYMENT_ENTITY_GUID: ${{ secrets.NEW_RELIC_DEPLOYMENT_ENTITY_GUID }}