Skip to content

Commit

Permalink
Merge pull request #443 from sailpoint-oss/bug/aws-name
Browse files Browse the repository at this point in the history
Update concurrency
  • Loading branch information
philip-ellis-sp authored Dec 6, 2023
2 parents b5f4aeb + 8d6c93a commit 1467d8b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/infra-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:

# Allow one concurrent deployment
concurrency:
group: 'aws'
group: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.pull_request.number) || github.event_name == 'push' && 'main' }}
cancel-in-progress: true

env:
Expand Down Expand Up @@ -80,6 +80,7 @@ jobs:
with:
issue-number: ${{ github.event.pull_request.number }}
body-includes: Visit the preview URL for this PR
continue-on-error: true
- name: add cloudfront url to PR
if: github.event_name == 'pull_request'
uses: peter-evans/create-or-update-comment@v2
Expand All @@ -88,4 +89,5 @@ jobs:
issue-number: ${{ github.event.pull_request.number }}
edit-mode: replace
body: |
🌎🌎🌎 Visit the preview URL for this PR [HERE](https://${{ env.CLOUDFRONT_URL }})
🌎🌎🌎 Visit the preview URL for this PR [HERE](https://${{ env.CLOUDFRONT_URL }})
continue-on-error: true
7 changes: 1 addition & 6 deletions .github/workflows/pr-infra-destroy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Build/Deploy to AWS
name: PR infra destroy

on:
# Runs on pushes targeting the default branch
Expand All @@ -8,11 +8,6 @@ on:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Allow one concurrent deployment
concurrency:
group: 'aws'
cancel-in-progress: true

env:
BASE_URL: '/'

Expand Down

0 comments on commit 1467d8b

Please sign in to comment.