Skip to content

Commit 6d964f7

Browse files
kevin9foongeliotlimdependabot[bot]scottheng96
authored
build: release v6.276.0 (#8938)
* feat: reserve cpu for formsg app (#8933) * build(deps): bump mdast-util-to-hast from 13.1.0 to 13.2.1 in /frontend (#8934) Bumps [mdast-util-to-hast](https://github.com/syntax-tree/mdast-util-to-hast) from 13.1.0 to 13.2.1. - [Release notes](https://github.com/syntax-tree/mdast-util-to-hast/releases) - [Commits](syntax-tree/mdast-util-to-hast@13.1.0...13.2.1) --- updated-dependencies: - dependency-name: mdast-util-to-hast dependency-version: 13.2.1 dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix(deps): bump validator from 13.15.20 to 13.15.23 (#8937) Bumps [validator](https://github.com/validatorjs/validator.js) from 13.15.20 to 13.15.23. - [Release notes](https://github.com/validatorjs/validator.js/releases) - [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md) - [Commits](validatorjs/validator.js@13.15.20...13.15.23) --- updated-dependencies: - dependency-name: validator dependency-version: 13.15.23 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump validator from 13.15.20 to 13.15.22 in /frontend (#8936) Bumps [validator](https://github.com/validatorjs/validator.js) from 13.15.20 to 13.15.22. - [Release notes](https://github.com/validatorjs/validator.js/releases) - [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md) - [Commits](validatorjs/validator.js@13.15.20...13.15.22) --- updated-dependencies: - dependency-name: validator dependency-version: 13.15.22 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix(deps): bump libphonenumber-js from 1.12.29 to 1.12.31 in /shared (#8935) Bumps [libphonenumber-js](https://gitlab.com/catamphetamine/libphonenumber-js) from 1.12.29 to 1.12.31. - [Changelog](https://gitlab.com/catamphetamine/libphonenumber-js/blob/master/CHANGELOG.md) - [Commits](https://gitlab.com/catamphetamine/libphonenumber-js/compare/v1.12.29...v1.12.31) --- updated-dependencies: - dependency-name: libphonenumber-js dependency-version: 1.12.31 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix: replace id with _id for text and vision mfb prompts (#8530) replace id with _id for text and vision mfb prompts * chore: bump version to v6.276.0 --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Eliot Lim <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: scottheng96 <[email protected]>
2 parents 10500fa + 676e2d2 commit 6d964f7

15 files changed

+68
-44
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
ecr-repository: 'formsg'
2727
# ECS configuration
2828
ecs-cpu: 1024
29+
formsg-app-reserved-cpu: 896
2930
ecs-memory: 4096
3031
ecs-cluster-name: 'formsg-prod-ecs'
3132
ecs-service-name: 'formsg-prod-ecs-service'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
ecr-repository: 'formsg'
2727
# ECS configuration
2828
ecs-cpu: 1024
29+
formsg-app-reserved-cpu: 896
2930
ecs-memory: 2048
3031
ecs-cluster-name: 'formsg-stg-alt-ecs'
3132
ecs-service-name: 'formsg-stg-alt-ecs-service'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
ecr-repository: 'formsg'
2727
# ECS configuration
2828
ecs-cpu: 1024
29+
formsg-app-reserved-cpu: 896
2930
ecs-memory: 2048
3031
ecs-cluster-name: 'formsg-stg-alt2-ecs'
3132
ecs-service-name: 'formsg-stg-alt2-ecs-service'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
ecr-repository: 'formsg'
2727
# ECS configuration
2828
ecs-cpu: 1024
29+
formsg-app-reserved-cpu: 896
2930
ecs-memory: 2048
3031
ecs-cluster-name: 'formsg-stg-alt3-ecs'
3132
ecs-service-name: 'formsg-stg-alt3-ecs-service'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
ecr-repository: 'formsg'
2727
# ECS configuration
2828
ecs-cpu: 1024
29+
formsg-app-reserved-cpu: 896
2930
ecs-memory: 2048
3031
ecs-cluster-name: 'formsg-stg-ecs'
3132
ecs-service-name: 'formsg-stg-ecs-service'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
ecr-repository: 'formsg'
2727
# ECS configuration
2828
ecs-cpu: 1024
29+
formsg-app-reserved-cpu: 896
2930
ecs-memory: 2048
3031
ecs-cluster-name: 'formsg-uat-ecs'
3132
ecs-service-name: 'formsg-uat-ecs-service'

.github/workflows/deploy-ecs.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ on:
7171
description: 'FormSG SDK mode'
7272
required: true
7373
type: string
74+
formsg-app-reserved-cpu:
75+
description: 'FormSG app reserved CPU units'
76+
required: true
77+
type: number
7478
dd-env:
7579
description: 'Datadog environment'
7680
required: true
@@ -184,6 +188,7 @@ jobs:
184188
run: |
185189
sed -i "s/<AWS_ACCOUNT_ID>/${{ secrets.aws-account-id }}/g" ${{ inputs.ecs-task-definition-path }}
186190
sed -i 's/<DD_ENV>/${{ inputs.dd-env }}/g' ${{ inputs.ecs-task-definition-path }}
191+
sed -i 's/<FORMSG_APP_RESERVED_CPU>/${{ inputs.formsg-app-reserved-cpu }}/g' ${{ inputs.ecs-task-definition-path }}
187192
sed -i 's/<CPU>/${{ inputs.ecs-cpu }}/g' ${{ inputs.ecs-task-definition-path }}
188193
sed -i 's/<MEMORY>/${{ inputs.ecs-memory }}/g' ${{ inputs.ecs-task-definition-path }}
189194
sed -i 's/<ENVIRONMENT_SITE_NAME>/${{ inputs.environment-site-name }}/g' ${{ inputs.ecs-task-definition-path }}

CHANGELOG.md

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,25 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7-
#### [v6.275.0](https://github.com/opengovsg/FormSG/compare/v6.275.0...v6.275.0)
7+
#### [v6.276.0](https://github.com/opengovsg/FormSG/compare/v6.275.0...v6.276.0)
88

9-
- chore: remove clamav [`#8914`](https://github.com/opengovsg/FormSG/pull/8914)
9+
- fix: replace id with _id for text and vision mfb prompts [`#8530`](https://github.com/opengovsg/FormSG/pull/8530)
10+
- fix(deps): bump libphonenumber-js from 1.12.29 to 1.12.31 in /shared [`#8935`](https://github.com/opengovsg/FormSG/pull/8935)
11+
- build(deps): bump validator from 13.15.20 to 13.15.22 in /frontend [`#8936`](https://github.com/opengovsg/FormSG/pull/8936)
12+
- fix(deps): bump validator from 13.15.20 to 13.15.23 [`#8937`](https://github.com/opengovsg/FormSG/pull/8937)
13+
- build(deps): bump mdast-util-to-hast from 13.1.0 to 13.2.1 in /frontend [`#8934`](https://github.com/opengovsg/FormSG/pull/8934)
14+
- feat: reserve cpu for formsg app [`#8933`](https://github.com/opengovsg/FormSG/pull/8933)
15+
- build: merge v6.275.0 back to develop [`#8927`](https://github.com/opengovsg/FormSG/pull/8927)
16+
- build: release v6.275.0 [`#8926`](https://github.com/opengovsg/FormSG/pull/8926)
1017

1118
#### [v6.275.0](https://github.com/opengovsg/FormSG/compare/v6.274.0...v6.275.0)
1219

1320
> 27 November 2025
1421

22+
- chore: remove clamav [`#8914`](https://github.com/opengovsg/FormSG/pull/8914)
1523
- build: merge v6.274.0 back to develop [`#8924`](https://github.com/opengovsg/FormSG/pull/8924)
1624
- build: release v6.274.0 [`#8923`](https://github.com/opengovsg/FormSG/pull/8923)
17-
- chore: bump version to v6.275.0 [`589c458`](https://github.com/opengovsg/FormSG/commit/589c458848a15d4ba4426be63235319364b0fef0)
25+
- chore: bump version to v6.275.0 [`6fb3fb2`](https://github.com/opengovsg/FormSG/commit/6fb3fb26605e231f51a8e67c4bf21636cc353676)
1826

1927
#### [v6.274.0](https://github.com/opengovsg/FormSG/compare/v6.273.0...v6.274.0)
2028

@@ -386,6 +394,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
386394
- build(deps): bump next from 15.3.4 to 15.5.2 in /react-email-preview [`#8660`](https://github.com/opengovsg/FormSG/pull/8660)
387395
- fix(deps): bump next from 15.3.4 to 15.5.2 [`#8661`](https://github.com/opengovsg/FormSG/pull/8661)
388396
- build(deps-dev): bump vite from 5.4.19 to 5.4.20 in /frontend [`#8686`](https://github.com/opengovsg/FormSG/pull/8686)
397+
- fix: home number fields are added to the draft despite not being modified [`#8704`](https://github.com/opengovsg/FormSG/pull/8704)
389398
- Revert "feat: save draft v1.0 (#8091)" [`ef00908`](https://github.com/opengovsg/FormSG/commit/ef00908c4fa711b8022f06a59595d13ec24d2963)
390399
- Revert "fix: home number fields are added to the draft despite not being modified (#8704)" [`8ceffce`](https://github.com/opengovsg/FormSG/commit/8ceffce1e0485fa4623cb941dd1042f73bedd5f6)
391400
- chore: bump version to v6.242.0 [`49cfc58`](https://github.com/opengovsg/FormSG/commit/49cfc582734a9110861ec37aa14932753639e334)
@@ -394,11 +403,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
394403

395404
> 16 September 2025
396405

397-
- fix: home number fields are added to the draft despite not being modified [`#8704`](https://github.com/opengovsg/FormSG/pull/8704)
398406
- feat: save draft v1.0 [`#8091`](https://github.com/opengovsg/FormSG/pull/8091)
399407
- build: merge release v6.240.0 to develop [`#8695`](https://github.com/opengovsg/FormSG/pull/8695)
400408
- build: release v6.240.0 [`#8693`](https://github.com/opengovsg/FormSG/pull/8693)
401-
- chore: bump version to v6.241.0 [`13345f3`](https://github.com/opengovsg/FormSG/commit/13345f3eabe3c954d90b8ec10ca4e15c6b709b68)
409+
- chore: bump version to v6.241.0 [`8572128`](https://github.com/opengovsg/FormSG/commit/8572128021278843f40d95dd30722a2f81370e5d)
402410

403411
#### [v6.240.0](https://github.com/opengovsg/FormSG/compare/v6.239.0...v6.240.0)
404412

@@ -1224,6 +1232,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
12241232
- build: merge release v6.178.2 to develop [`#8111`](https://github.com/opengovsg/FormSG/pull/8111)
12251233
- build: release v6.178.2 [`#8110`](https://github.com/opengovsg/FormSG/pull/8110)
12261234
- fix: also match amount paid [`#8109`](https://github.com/opengovsg/FormSG/pull/8109)
1235+
- fix: hawkeye v1.0 pending response at missing bug [`#8106`](https://github.com/opengovsg/FormSG/pull/8106)
1236+
- chore: remove coverage restriction, inspect through datadog instead [`#8100`](https://github.com/opengovsg/FormSG/pull/8100)
12271237
- chore: bump version to v6.179.0 [`1247426`](https://github.com/opengovsg/FormSG/commit/1247426080ba2254a33c8efb3deb51c6cd9f7e9e)
12281238
- chore: bump version to v6.178.2 [`618bdff`](https://github.com/opengovsg/FormSG/commit/618bdffa52a73fca82c53283ee7868390af42c91)
12291239
- chore: bump version to v6.180.0 [`13b3fc4`](https://github.com/opengovsg/FormSG/commit/13b3fc4c696810eb1c58a54edf4d583894022b52)
@@ -1232,15 +1242,13 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
12321242

12331243
> 13 February 2025
12341244

1235-
- fix: hawkeye v1.0 pending response at missing bug [`#8106`](https://github.com/opengovsg/FormSG/pull/8106)
1236-
- chore: remove coverage restriction, inspect through datadog instead [`#8100`](https://github.com/opengovsg/FormSG/pull/8100)
12371245
- feat: address field [`#7966`](https://github.com/opengovsg/FormSG/pull/7966)
12381246
- feat(mrf-admin-view): hawkeye v1.0 [`#7965`](https://github.com/opengovsg/FormSG/pull/7965)
12391247
- fix(deps): bump zod from 3.24.1 to 3.24.2 in /shared [`#8101`](https://github.com/opengovsg/FormSG/pull/8101)
12401248
- fix: failing test for new joi validation [`#8098`](https://github.com/opengovsg/FormSG/pull/8098)
12411249
- build: release v6.178.1 to develop [`#8096`](https://github.com/opengovsg/FormSG/pull/8096)
12421250
- build: merge release v6.178.0 to develop [`#8093`](https://github.com/opengovsg/FormSG/pull/8093)
1243-
- chore: bump version to v6.179.0 [`9ace3f2`](https://github.com/opengovsg/FormSG/commit/9ace3f23a41f089356ba43013a71d5e996748777)
1251+
- chore: bump version to v6.179.0 [`affeb5f`](https://github.com/opengovsg/FormSG/commit/affeb5f3ed0c9add243c763ebf02905f35e91bca)
12441252

12451253
#### [v6.178.2](https://github.com/opengovsg/FormSG/compare/v6.178.1...v6.178.2)
12461254

@@ -1311,40 +1319,44 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
13111319
- * fix(deps): bump libphonenumber-js from 1.11.16 to 1.11.17 in /shared (#8021) [`#8039`](https://github.com/opengovsg/FormSG/pull/8039)
13121320
- fix(deps): bump zod from 3.23.8 to 3.24.1 in /shared [`#7996`](https://github.com/opengovsg/FormSG/pull/7996)
13131321
- fix(deps): bump type-fest from 4.30.2 to 4.32.0 in /shared [`#8037`](https://github.com/opengovsg/FormSG/pull/8037)
1322+
- fix: set limit to 250kb for whitelist [`#8043`](https://github.com/opengovsg/FormSG/pull/8043)
1323+
- build: merge release v6.173.1 to develop [`#8044`](https://github.com/opengovsg/FormSG/pull/8044)
1324+
- build: release v6.173.1 [`#8042`](https://github.com/opengovsg/FormSG/pull/8042)
1325+
- fix: remove multer [`#8041`](https://github.com/opengovsg/FormSG/pull/8041)
1326+
- chore: bump version to v6.174.0 [`d3ee082`](https://github.com/opengovsg/FormSG/commit/d3ee082079a5a658aefb3821eb608b8497985bc5)
1327+
- chore: bump version to v6.173.1 [`70fd33a`](https://github.com/opengovsg/FormSG/commit/70fd33aa01b398f98f2b2dfee6880cd043889cc1)
13141328
- chore: bump version to v6.175.0 [`d31bb97`](https://github.com/opengovsg/FormSG/commit/d31bb9717625d365d6798a51d8235b5acdab706c)
13151329

13161330
#### [v6.174.0](https://github.com/opengovsg/FormSG/compare/v6.173.1...v6.174.0)
13171331

13181332
> 13 January 2025
13191333

1320-
- fix: set limit to 250kb for whitelist [`#8043`](https://github.com/opengovsg/FormSG/pull/8043)
1321-
- build: merge release v6.173.1 to develop [`#8044`](https://github.com/opengovsg/FormSG/pull/8044)
1322-
- build: release v6.173.1 [`#8042`](https://github.com/opengovsg/FormSG/pull/8042)
13231334
- fix: only show fixed translations for supported forms [`#8038`](https://github.com/opengovsg/FormSG/pull/8038)
13241335
- feat(iframe): add frame messaging for paysg [`#7979`](https://github.com/opengovsg/FormSG/pull/7979)
13251336
- chore: mongoose, nanoid packages update [`#8000`](https://github.com/opengovsg/FormSG/pull/8000)
13261337
- build: merge release v6.173.0 to develop [`#8034`](https://github.com/opengovsg/FormSG/pull/8034)
13271338
- fix(deps): bump libphonenumber-js from 1.11.16 to 1.11.17 in /shared [`#8021`](https://github.com/opengovsg/FormSG/pull/8021)
1328-
- chore: bump version to v6.174.0 [`d3ee082`](https://github.com/opengovsg/FormSG/commit/d3ee082079a5a658aefb3821eb608b8497985bc5)
1339+
- chore: bump version to v6.174.0 [`22b1122`](https://github.com/opengovsg/FormSG/commit/22b1122e8e15dbb8ca4c69c1d6c026a865d3b67c)
13291340

13301341
#### [v6.173.1](https://github.com/opengovsg/FormSG/compare/v6.173.0...v6.173.1)
13311342

13321343
> 13 January 2025
13331344

13341345
- fix: remove multer [`#8041`](https://github.com/opengovsg/FormSG/pull/8041)
13351346
- * fix(deps): bump fp-ts from 2.16.8 to 2.16.9 (#8017) [`#8027`](https://github.com/opengovsg/FormSG/pull/8027)
1347+
- fix: update mongodb binary version to 6 [`#8032`](https://github.com/opengovsg/FormSG/pull/8032)
13361348
- chore: bump version to v6.173.1 [`70fd33a`](https://github.com/opengovsg/FormSG/commit/70fd33aa01b398f98f2b2dfee6880cd043889cc1)
1349+
- chore: bump version to v6.173.0 [`54e544d`](https://github.com/opengovsg/FormSG/commit/54e544d9835af07fbcd2b0218ed522c26b18fa5e)
13371350

13381351
#### [v6.173.0](https://github.com/opengovsg/FormSG/compare/v6.172.0...v6.173.0)
13391352

13401353
> 7 January 2025
13411354

1342-
- fix: update mongodb binary version to 6 [`#8032`](https://github.com/opengovsg/FormSG/pull/8032)
13431355
- feat: multi lang feature [`#8022`](https://github.com/opengovsg/FormSG/pull/8022)
13441356
- fix(deps): bump fp-ts from 2.16.8 to 2.16.9 [`#8017`](https://github.com/opengovsg/FormSG/pull/8017)
13451357
- build: merge release v6.172.0 to develop [`#8016`](https://github.com/opengovsg/FormSG/pull/8016)
13461358
- build: release v6.172.0 [`#8015`](https://github.com/opengovsg/FormSG/pull/8015)
1347-
- chore: bump version to v6.173.0 [`54e544d`](https://github.com/opengovsg/FormSG/commit/54e544d9835af07fbcd2b0218ed522c26b18fa5e)
1359+
- chore: bump version to v6.173.0 [`1cb7772`](https://github.com/opengovsg/FormSG/commit/1cb7772374249830091d1fb3278a035957d23bcb)
13481360

13491361
#### [v6.172.0](https://github.com/opengovsg/FormSG/compare/v6.171.0...v6.172.0)
13501362

deploy/ecs-task-definition.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"portMappings": [
77
{ "containerPort": 4545, "hostPort": 4545, "protocol": "tcp" }
88
],
9+
"cpu": "<FORMSG_APP_RESERVED_CPU>",
910
"environment": [
1011
{ "name": "DD_SERVICE", "value": "formsg" },
1112
{ "name": "DD_ENV", "value": "<DD_ENV>" }

frontend/package-lock.json

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)