Skip to content

Commit bb86839

Browse files
committed
Merge branch 'dev' into stage
2 parents 48ef508 + 159459e commit bb86839

File tree

5 files changed

+32
-23
lines changed

5 files changed

+32
-23
lines changed

.github/workflows/aws-deploy.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ on:
2424
environment:
2525
required: true
2626
type: string
27-
default: "dev"
2827
secrets-location:
2928
type: string
3029
default: "local"
@@ -38,8 +37,6 @@ jobs:
3837
steps:
3938
- name: Checkout repository
4039
uses: actions/checkout@v3
41-
with:
42-
ref: ${{ inputs.environment }}
4340
- name: Install AWS CLI
4441
run: sudo snap install aws-cli --classic
4542
- name: Install AWS CDK CLI

.github/workflows/deploy-prod.yaml

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
name: deploy-prod
22

33
on:
4-
workflow_run:
5-
workflows:
6-
- check
7-
types:
8-
- completed
9-
branches:
10-
- prod
4+
push:
5+
branches: ['prod']
116

127
jobs:
8+
test:
9+
uses: ./.github/workflows/test.yaml
10+
with:
11+
environment: prod
1312
aws-deploy:
1413
uses: "./.github/workflows/aws-deploy.yaml"
1514
with:

.github/workflows/deploy-stage.yaml

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
name: deploy-stage
22

33
on:
4-
workflow_run:
5-
workflows:
6-
- check
7-
types:
8-
- completed
9-
branches:
10-
- stage
4+
push:
5+
branches: ['stage']
116

127
jobs:
8+
test:
9+
uses: ./.github/workflows/test.yaml
10+
with:
11+
environment: stage
1312
aws-deploy:
1413
uses: "./.github/workflows/aws-deploy.yaml"
1514
with:

.github/workflows/pr-check.yml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
name: pr-check
2+
3+
on:
4+
pull_request:
5+
branches: ['*']
6+
7+
jobs:
8+
test:
9+
uses: ./.github/workflows/test.yaml
10+
with:
11+
environment: dev

.github/workflows/check.yml .github/workflows/test.yaml

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
name: check
1+
name: test
22

33
on:
4-
pull_request:
5-
branches: ['*']
6-
push:
7-
branches: ['*']
8-
4+
workflow_call:
5+
inputs:
6+
environment:
7+
required: true
8+
type: string
99
jobs:
1010
unit-tests:
1111
runs-on: ubuntu-latest
@@ -25,6 +25,9 @@ jobs:
2525
run: pip install -r requirements.txt -r requirements-dev.txt
2626
- name: Generate cloudformation
2727
uses: youyo/aws-cdk-github-actions@v2
28+
env:
29+
ENV: ${{ inputs.environment }}
30+
secrets-location: "ssm"
2831
with:
2932
cdk_subcommand: 'synth'
3033
actions_comment: false

0 commit comments

Comments
 (0)