Skip to content

Commit cfe5d33

Browse files
committed
Merge branch 'PEER-236-Messaging-UI' of https://github.com/CS3219-AY2425S1/cs3219-ay2425s1-project-g16 into PEER-236-Messaging-UI
2 parents 80bd0f6 + b9dff5d commit cfe5d33

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

.github/workflows/build-deploy-docker.yaml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -201,15 +201,12 @@ jobs:
201201
prev_step_success="${{ steps.gcloud-auth.outcome }}"
202202
if [[ "$prev_step_success" != "success" ]]; then
203203
echo "is_up=false" >> $GITHUB_OUTPUT
204-
exit 0
205-
fi
206-
207-
clusters="$(gcloud container clusters list)"
208-
is_up="$(echo $clusters | grep ${{ secrets.GKE_CLUSTER }})"
209-
if [[ -z "$is_up" ]]; then
210-
echo "is_up=false" >> $GITHUB_OUTPUT
211-
else
212-
echo "is_up=true" >> $GITHUB_OUTPUT
204+
else
205+
if [[ -z "$(gcloud container clusters list | grep ${{ secrets.GKE_CLUSTER }})" ]]; then
206+
echo "is_up=false" >> $GITHUB_OUTPUT
207+
else
208+
echo "is_up=true" >> $GITHUB_OUTPUT
209+
fi
213210
fi
214211
215212
- name: Get GKE creds

backend/chat/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const shutdown = () => {
2626
})
2727
.then(() => {
2828
logger.info('App shut down');
29+
process.exit(0);
2930
});
3031
});
3132
};

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
"version": "0.0.1",
44
"private": true,
55
"scripts": {
6-
"dev": "concurrently --names user,qn,collab,match,fe --pad-prefix \"npm run dev:user\" \"npm run dev:question\" \"npm run dev:collab\" \"npm run dev:match\" \"npm run dev:frontend\"",
6+
"dev": "concurrently --names user,qn,collab,match,chat,fe --pad-prefix \"npm run dev:user\" \"npm run dev:question\" \"npm run dev:collab\" \"npm run dev:match\" \"npm run dev:chat\" \"npm run dev:frontend\"",
77
"dev:frontend": "npm run dev -w frontend",
88
"dev:user": "npm run dev -w user",
99
"dev:question": "npm run dev -w question",
1010
"dev:collab": "npm run dev -w collaboration",
1111
"dev:match": "npm run dev -w matching",
12+
"dev:chat": "npm run dev -w chat",
1213
"build": "npm run build --workspaces --if-present",
1314
"fmt": "prettier --config .prettierrc \"./**/*.{ts,tsx}\" --write",
1415
"lint": "eslint --config .eslintrc.json \"./**/*.{ts,tsx}\" --fix",

0 commit comments

Comments
 (0)