diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 3141c9d2d..ad8a9ee90 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -1,6 +1,6 @@ name: Deploy -run-name: Deploy ${{ inputs.gitRef }} to ${{ inputs.environment }} +run-name: Deploy ${{ inputs.gitRef || github.ref_name }} to ${{ inputs.environment || 'integration' }} on: workflow_dispatch: @@ -30,17 +30,17 @@ jobs: name: Build and publish image uses: alphagov/govuk-infrastructure/.github/workflows/build-and-push-image.yaml@main with: - gitRef: ${{ github.event.inputs.gitRef || github.ref }} + gitRef: ${{ inputs.gitRef || github.ref }} secrets: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_GOVUK_ECR_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_GOVUK_ECR_SECRET_ACCESS_KEY }} trigger-deploy: - name: Trigger deploy to ${{ github.event.inputs.environment }} + name: Trigger deploy to ${{ inputs.environment || 'integration' }} needs: build-and-publish-image uses: alphagov/govuk-infrastructure/.github/workflows/deploy.yaml@main with: imageTag: ${{ needs.build-and-publish-image.outputs.imageTag }} - environment: ${{ github.event.inputs.environment }} + environment: ${{ inputs.environment || 'integration' }} secrets: WEBHOOK_TOKEN: ${{ secrets.GOVUK_ARGO_EVENTS_WEBHOOK_TOKEN }} WEBHOOK_URL: ${{ secrets.GOVUK_ARGO_EVENTS_WEBHOOK_URL }}