Skip to content

Commit 46c7e20

Browse files
Merge pull request #5 from daniellehopedev/workflow-fixes
fixes part 2
2 parents 6a3cd41 + 7623be2 commit 46c7e20

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.github/workflows/cfn-validate-pr.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@ name: Validate CloudFormation on PR
22

33
on:
44
pull_request:
5-
types: [opened, synchronize]
65
paths:
76
- 'cloudformation/**'
7+
push:
8+
branches:
9+
- main
810

911
permissions:
1012
pull-requests: write
@@ -13,6 +15,7 @@ permissions:
1315
jobs:
1416
validate-cfn:
1517
runs-on: ubuntu-latest
18+
if: ${{ github.event.pull_request.merged != true }}
1619
steps:
1720
- uses: actions/checkout@v4
1821

@@ -48,10 +51,6 @@ jobs:
4851
runs-on: ubuntu-latest
4952
if: ${{ github.event.pull_request.merged == true }}
5053
steps:
51-
- name: Log PR merged status
52-
run: |
53-
echo "PR merged: ${{ github.event.pull_request.merged }}"
54-
5554
- name: Configure AWS credentials
5655
uses: aws-actions/configure-aws-credentials@v4
5756
with:

cloudformation/s3-bucket.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Resources:
1919
- Key: Environment
2020
Value: !Ref Environment
2121
- Key: Project
22-
Value: GitHubActionsTestingPRCICD-2
22+
Value: GitHubActionsTestingPRCICD-3
2323

2424
Outputs:
2525
BucketName:

0 commit comments

Comments
 (0)