Skip to content

Commit 2701b61

Browse files
scottheng96scottheng96
authored
Merge pull request #8847 from opengovsg/release_v6.263.0
build: release v6.263.0
2 parents 2098f31 + 51d1069 commit 2701b61

37 files changed

+474
-281
lines changed

‎.github/workflows/aws-deploy-scanner.yml‎

Lines changed: 0 additions & 63 deletions
This file was deleted.

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,17 @@ name: CI
33
on:
44
push:
55
branches-ignore:
6-
- staging
7-
- staging-alt
8-
- staging-alt2
6+
- stg
97
- stg-alt
8+
- stg-alt2
109
- stg-alt3
1110
- uat
1211
pull_request:
1312
types: [opened, reopened]
1413
branches-ignore:
15-
- staging
16-
- staging-alt
17-
- staging-alt2
14+
- stg
1815
- stg-alt
16+
- stg-alt2
1917
- stg-alt3
2018
- uat
2119

‎.github/workflows/deploy-eb.yml‎

Lines changed: 0 additions & 141 deletions
This file was deleted.

‎.github/workflows/deploy-ecs-stg-alt2.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Deploy FormSG app to stg-alt2
2+
3+
concurrency:
4+
group: ${{ github.workflow }}-${{ github.ref }}
5+
cancel-in-progress: true
6+
7+
on:
8+
push:
9+
branches:
10+
- stg-alt2
11+
12+
jobs:
13+
deploy:
14+
name: Deploy
15+
uses: ./.github/workflows/deploy-ecs.yml
16+
with:
17+
gha-environment: 'stg-alt2'
18+
# Environment configuration
19+
environment: 'stg-alt2'
20+
environment-site-name: 'stg-alt2'
21+
app-version: ${{ github.sha }}
22+
app-url: 'https://stg-alt2.form.gov.sg'
23+
react-app-form-sg-sdk-mode: 'staging'
24+
# AWS configuration
25+
aws-region: 'ap-southeast-1'
26+
ecr-repository: 'formsg'
27+
# ECS configuration
28+
ecs-cpu: 1024
29+
ecs-memory: 2048
30+
ecs-cluster-name: 'formsg-stg-alt2-ecs'
31+
ecs-service-name: 'formsg-stg-alt2-ecs-service'
32+
ecs-task-definition: 'formsg-stg-alt2-ecs'
33+
ecs-task-definition-path: 'deploy/ecs-task-definition.json'
34+
ecs-container-name: 'formsg-app'
35+
# CodeDeploy configuration
36+
codedeploy-application: 'formsg-stg-alt2-ecs-app'
37+
codedeploy-appspec-path: deploy/appspec.yml
38+
codedeploy-deployment-group: 'formsg-stg-alt2-ecs-dg'
39+
# Datadog config
40+
dd-env: 'stg-alt2'
41+
secrets:
42+
# AWS credentials and configuration
43+
aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
44+
cicd-role: ${{ secrets.IAC_AWS_CI_ROLE_TO_ASSUME }}
45+
# Monitoring and analytics configuration
46+
ga-tracking-id: ${{ secrets.GA_TRACKING_ID }}
47+
dd-rum-app-id: ${{ secrets.DD_RUM_APP_ID }}
48+
dd-rum-client-token: ${{ secrets.DD_RUM_CLIENT_TOKEN }}
49+
dd-sample-rate: ${{ secrets.DD_SAMPLE_RATE }}
50+
DD_API_KEY: ${{ secrets.DD_API_KEY }}
51+
S3_STATIC_ASSETS_BUCKET_NAME: ${{ secrets.S3_STATIC_ASSETS_BUCKET_NAME }}

‎.github/workflows/deploy-ecs-stg.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Deploy FormSG app to stg
2+
3+
concurrency:
4+
group: ${{ github.workflow }}-${{ github.ref }}
5+
cancel-in-progress: true
6+
7+
on:
8+
push:
9+
branches:
10+
- stg
11+
12+
jobs:
13+
deploy:
14+
name: Deploy
15+
uses: ./.github/workflows/deploy-ecs.yml
16+
with:
17+
gha-environment: 'stg'
18+
# Environment configuration
19+
environment: 'stg'
20+
environment-site-name: 'stg'
21+
app-version: ${{ github.sha }}
22+
app-url: 'https://stg.form.gov.sg'
23+
react-app-form-sg-sdk-mode: 'staging'
24+
# AWS configuration
25+
aws-region: 'ap-southeast-1'
26+
ecr-repository: 'formsg'
27+
# ECS configuration
28+
ecs-cpu: 1024
29+
ecs-memory: 2048
30+
ecs-cluster-name: 'formsg-stg-ecs'
31+
ecs-service-name: 'formsg-stg-ecs-service'
32+
ecs-task-definition: 'formsg-stg-ecs'
33+
ecs-task-definition-path: 'deploy/ecs-task-definition.json'
34+
ecs-container-name: 'formsg-app'
35+
# CodeDeploy configuration
36+
codedeploy-application: 'formsg-stg-ecs-app'
37+
codedeploy-appspec-path: deploy/appspec.yml
38+
codedeploy-deployment-group: 'formsg-stg-ecs-dg'
39+
# Datadog config
40+
dd-env: 'stg'
41+
secrets:
42+
# AWS credentials and configuration
43+
aws-account-id: ${{ secrets.AWS_ACCOUNT_ID }}
44+
cicd-role: ${{ secrets.IAC_AWS_CI_ROLE_TO_ASSUME }}
45+
# Monitoring and analytics configuration
46+
ga-tracking-id: ${{ secrets.GA_TRACKING_ID }}
47+
dd-rum-app-id: ${{ secrets.DD_RUM_APP_ID }}
48+
dd-rum-client-token: ${{ secrets.DD_RUM_CLIENT_TOKEN }}
49+
dd-sample-rate: ${{ secrets.DD_SAMPLE_RATE }}
50+
DD_API_KEY: ${{ secrets.DD_API_KEY }}
51+
S3_STATIC_ASSETS_BUCKET_NAME: ${{ secrets.S3_STATIC_ASSETS_BUCKET_NAME }}

‎.github/workflows/deploy-ecs.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
environment-site-name:
1414
description: 'Deployment environment site name'
1515
required: true
16-
type: string # staging, staging-alt, staging-alt2, stg-alt, stg-alt3, prod, uat
16+
type: string # stg, stg-alt, stg-alt2, stg-alt3, prod, uat
1717
ecs-cpu:
1818
description: 'ECS CPU units to use'
1919
required: true

‎.github/workflows/deploy-pdf-gen-stg-alt2.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Deploy PDF Generator Lambda to stg-alt2
2+
3+
concurrency:
4+
group: ${{ github.workflow }}-${{ github.ref }}
5+
cancel-in-progress: true
6+
7+
permissions:
8+
id-token: write
9+
contents: read
10+
11+
on:
12+
push:
13+
branches:
14+
- stg-alt2
15+
16+
jobs:
17+
deploy-pdf-gen-lambda:
18+
name: Deploy PDF Generator Lambda
19+
uses: ./.github/workflows/deploy-pdf-gen-lambda.yml
20+
with:
21+
gha-environment: 'stg-alt2'
22+
checkoutBranch: 'stg-alt2'
23+
environment: 'stg-alt2'
24+
secrets:
25+
cicd-role: ${{ secrets.IAC_AWS_CI_ROLE_TO_ASSUME }}

‎.github/workflows/deploy-pdf-gen-staging.yml‎ renamed to ‎.github/workflows/deploy-pdf-gen-stg.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Deploy PDF Generator Lambda to staging
1+
name: Deploy PDF Generator Lambda to stg
22

33
concurrency:
44
group: ${{ github.workflow }}-${{ github.ref }}
@@ -11,15 +11,15 @@ permissions:
1111
on:
1212
push:
1313
branches:
14-
- staging
14+
- stg
1515

1616
jobs:
1717
deploy-pdf-gen-lambda:
1818
name: Deploy PDF Generator Lambda
1919
uses: ./.github/workflows/deploy-pdf-gen-lambda.yml
2020
with:
21-
gha-environment: 'staging'
22-
checkoutBranch: 'staging'
23-
environment: 'staging'
21+
gha-environment: 'stg'
22+
checkoutBranch: 'stg'
23+
environment: 'stg'
2424
secrets:
2525
cicd-role: ${{ secrets.IAC_AWS_CI_ROLE_TO_ASSUME }}

0 commit comments

Comments
 (0)