Merge pull request #1292 from isomerpages/release_v0.78.0

release v0.78.0
isomerpages · Apr 11, 2024 · f46fc3c · f46fc3c
2 parents 0c538b8 + 72f39bd
commit f46fc3c
Show file tree

Hide file tree

Showing 11 changed files with 430 additions and 164 deletions.
diff --git a/.aws/deploy/backend-task-definition.prod.json b/.aws/deploy/backend-task-definition.prod.json
@@ -10,7 +10,17 @@
         }
       ],
       "essential": true,
-      "environment": [{ "name": "ENV_TYPE", "value": "PROD" }],
+      "environment": [
+        { "name": "ENV_TYPE", "value": "PROD" },
+        {
+          "name": "DD_GIT_COMMIT_SHA",
+          "value": "<DD_COMMIT_SHA>"
+        },
+        {
+          "name": "DD_GIT_REPOSITORY_URL",
+          "value": "github.com/isomerpages/isomercms-backend"
+        }
+      ],
       "mountPoints": [
         {
           "sourceVolume": "ggs-efs",

diff --git a/.aws/deploy/backend-task-definition.staging.json b/.aws/deploy/backend-task-definition.staging.json
@@ -10,7 +10,17 @@
         }
       ],
       "essential": true,
-      "environment": [{ "name": "ENV_TYPE", "value": "STAGING" }],
+      "environment": [
+        { "name": "ENV_TYPE", "value": "STAGING" },
+        {
+          "name": "DD_GIT_COMMIT_SHA",
+          "value": "<DD_COMMIT_SHA>"
+        },
+        {
+          "name": "DD_GIT_REPOSITORY_URL",
+          "value": "github.com/isomerpages/isomercms-backend"
+        }
+      ],
       "mountPoints": [
         {
           "sourceVolume": "ggs-efs",

diff --git a/.github/mergify.yml b/.github/mergify.yml
@@ -3,8 +3,9 @@ pull_request_rules:
     conditions:
       - author~=^dependabot\[bot\]$
       - check-success~=lint
+      - check-success~=build
       - check-success~=test
-      - title~=bump [^\s]+ from ([\d]+)\..+ to \1\.
+      - -dependabot-update-type = version-update:semver-major
     actions:
       review:
         type: APPROVE
@@ -16,7 +17,8 @@ pull_request_rules:
       - author=snyk-bot
       - check-success~=lint
       - check-success~=test
-      - title~=^\[Snyk\]
+      - title~=^\[Snyk\]]
+      - base = develop
     actions:
       review:
         type: APPROVE
@@ -34,4 +36,15 @@ pull_request_rules:
       - title~=(?i)\[wip\]
     actions:
       edit:
-        draft: True
+        draft: True
+
+  - name: Ping Isomer members for stale open PRs (>1 month since last activity)
+    conditions:
+      - updated-at<30 days ago
+      - -closed
+    actions:
+      request_reviews:
+        teams:
+          - "@isomerpages/iso-engineers"
+      comment:
+        message: This pull request has been stale for more than 30 days! Could someone please take a look at it @isomerpages/iso-engineers
diff --git a/.github/workflows/aws_deploy.yml b/.github/workflows/aws_deploy.yml
@@ -114,6 +114,7 @@ jobs:
             sed -i 's/<AWS_ACCOUNT_ID>/${{ secrets.AWS_ACCOUNT_ID }}/g' ${{ inputs.task-definition-path }}
             sed -i 's/<EFS_FILE_SYSTEM_ID>/${{ secrets.EFS_FILE_SYSTEM_ID }}/g' ${{ inputs.task-definition-path }}
             sed -i 's/<DD_API_KEY>/${{ secrets.DD_API_KEY }}/g' ${{ inputs.task-definition-path }}
+            sed -i 's/<DD_COMMIT_SHA>/${{ github.sha }}/g' ${{ inputs.task-definition-path }}
       
       - name: Replace variables in appspec
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,10 +4,30 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v0.78.0](https://github.com/isomerpages/isomercms-backend/compare/v0.77.0...v0.78.0)
+
+- refactor(OTP): simplify code by using upsert()  [`#1283`](https://github.com/isomerpages/isomercms-backend/pull/1283)
+- refactor(UserService): simplify login by using findOrCreate() [`#1281`](https://github.com/isomerpages/isomercms-backend/pull/1281)
+- build(deps): bump @aws-sdk/client-amplify from 3.540.0 to 3.549.0 [`#1289`](https://github.com/isomerpages/isomercms-backend/pull/1289)
+- build(deps): bump js-base64 from 3.7.6 to 3.7.7 [`#1288`](https://github.com/isomerpages/isomercms-backend/pull/1288)
+- build(deps-dev): bump @types/aws-lambda from 8.10.132 to 8.10.137 [`#1286`](https://github.com/isomerpages/isomercms-backend/pull/1286)
+- chore: change error handler to use logger.error [`#1284`](https://github.com/isomerpages/isomercms-backend/pull/1284)
+- feat(task def): update env [`#1282`](https://github.com/isomerpages/isomercms-backend/pull/1282)
+- fix: name auth routers [`#1278`](https://github.com/isomerpages/isomercms-backend/pull/1278)
+- feat(dd): add source code linkage [`#1279`](https://github.com/isomerpages/isomercms-backend/pull/1279)
+- fix(mergify): fix mistake [`#1280`](https://github.com/isomerpages/isomercms-backend/pull/1280)
+- build(deps): bump base-64 from 0.1.0 to 1.0.0 [`#1254`](https://github.com/isomerpages/isomercms-backend/pull/1254)
+- build(deps): bump marked from 11.2.0 to 12.0.1 [`#1219`](https://github.com/isomerpages/isomercms-backend/pull/1219)
+- chore(ci): enhance mergify [`#1245`](https://github.com/isomerpages/isomercms-backend/pull/1245)
+- backport v0.77.0 [`#1277`](https://github.com/isomerpages/isomercms-backend/pull/1277)
+
 #### [v0.77.0](https://github.com/isomerpages/isomercms-backend/compare/v0.76.0...v0.77.0)
 
+> 8 April 2024
+
 - chore: index notifications table [`#1275`](https://github.com/isomerpages/isomercms-backend/pull/1275)
 - backport v0.76.0 [`#1274`](https://github.com/isomerpages/isomercms-backend/pull/1274)
+- chore: bump version to v0.77.0 [`29def1e`](https://github.com/isomerpages/isomercms-backend/commit/29def1ef0da032d137c09c27e0e4d3b790afc2aa)
 
 #### [v0.76.0](https://github.com/isomerpages/isomercms-backend/compare/v0.75.0...v0.76.0)