From a7dab89abd699db85579ddece5bc13c4da41cfd3 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 16:07:22 +0530 Subject: [PATCH 01/25] changes for BE CI/CD. --- .github/workflows/deploy-backend.yml | 49 ++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .github/workflows/deploy-backend.yml diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml new file mode 100644 index 0000000..fd58bcc --- /dev/null +++ b/.github/workflows/deploy-backend.yml @@ -0,0 +1,49 @@ +name: Build and Deploy to Google Cloud Run + +on: + pull_request: + paths: + - "server/**" + workflow_dispatch: + +jobs: + build_and_deploy: + runs-on: ubuntu-latest + env: + PROJECT_ID: ${{ secrets.PROJECT_ID }} + APP: chatterbox + REGION: asia-south1 + GAR_LOCATION: asia-south1 + steps: + - name: "Checkout Server Code" + uses: actions/checkout@v4 + with: + sparse-checkout: server + - name: "Google Auth" + uses: "google-github-actions/auth@v2" + with: + workload_identity_provider: "${{ secrets.WIF_PROVIDER }}" + service_account: "${{ secrets.WIF_SERVICE_ACCOUNT }}" + - name: "Set up Cloud SDK" + uses: "google-github-actions/setup-gcloud@v1" + with: + project_id: "${{ secrets.PROJECT_ID }}" + - name: "Docker auth" + run: |- + gcloud auth configure-docker ${{ env.GAR_LOCATION }}-docker.pkg.dev + - name: "Build and push container" + run: |- + docker build -t "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }}" ./server + docker push "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }}" + - name: "Create release name" + run: |- + echo "RELEASE_NAME=${{ env.APP }}-${GITHUB_SHA::7}-${GITHUB_RUN_NUMBER}" >> ${GITHUB_ENV} + - name: "Cloud Run Release" + id: "deploy" + uses: "google-github-actions/deploy-cloudrun@v2" + with: + service: "chatterbox-kunal-staging" + image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} + region: ${{ env.GAR_LOCATION }} + - name: "Use output" + run: 'curl "${{ steps.deploy.outputs.url }}"' From 1707c305711dd2035d80d7b2ded98c24f414a393 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 16:08:59 +0530 Subject: [PATCH 02/25] fix CI/CD --- .github/workflows/deploy-backend.yml | 1 + .github/workflows/firebase-hosting-pull-request.yml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index fd58bcc..1d5265e 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -4,6 +4,7 @@ on: pull_request: paths: - "server/**" + - ".github/**" workflow_dispatch: jobs: diff --git a/.github/workflows/firebase-hosting-pull-request.yml b/.github/workflows/firebase-hosting-pull-request.yml index 7ac6953..c7930d5 100644 --- a/.github/workflows/firebase-hosting-pull-request.yml +++ b/.github/workflows/firebase-hosting-pull-request.yml @@ -7,7 +7,6 @@ on: pull_request: paths: - 'client/**' # Only trigger on changes in the client directory - - '.github/**' workflow_dispatch: # Allows manual triggering permissions: From 530226911f8d3402484efc8341100710001bf7e3 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 16:30:40 +0530 Subject: [PATCH 03/25] let's go CI/CD --- .github/workflows/deploy-backend.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 1d5265e..706e077 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -7,6 +7,10 @@ on: - ".github/**" workflow_dispatch: +permissions: + id-token: write + contents: read + jobs: build_and_deploy: runs-on: ubuntu-latest From 68dab89b5b6080c4ad13699bf29b78e922b17da5 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 16:40:12 +0530 Subject: [PATCH 04/25] CI/CD --- .github/workflows/deploy-backend.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 706e077..ee460ff 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -52,3 +52,5 @@ jobs: region: ${{ env.GAR_LOCATION }} - name: "Use output" run: 'curl "${{ steps.deploy.outputs.url }}"' + + \ No newline at end of file From c44adf4ab49dd8a1c1260fd7c107b1e30eef5743 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 16:45:57 +0530 Subject: [PATCH 05/25] CI/CD --- .github/workflows/deploy-backend.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index ee460ff..7bafee5 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -51,6 +51,4 @@ jobs: image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} region: ${{ env.GAR_LOCATION }} - name: "Use output" - run: 'curl "${{ steps.deploy.outputs.url }}"' - - \ No newline at end of file + run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file From 715f4a20c7497551200ce55f4ab4bb55c43f8860 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 16:53:29 +0530 Subject: [PATCH 06/25] CICD --- .github/workflows/deploy-backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 7bafee5..c46131c 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -51,4 +51,4 @@ jobs: image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} region: ${{ env.GAR_LOCATION }} - name: "Use output" - run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file + run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file From a3a4db384e7259d972cb66fc42d72f30ec40e7e2 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 17:17:05 +0530 Subject: [PATCH 07/25] CI/CD --- .github/workflows/deploy-backend.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index c46131c..226441c 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -51,4 +51,5 @@ jobs: image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} region: ${{ env.GAR_LOCATION }} - name: "Use output" - run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file + run: 'curl "${{ steps.deploy.outputs.url }}"' + \ No newline at end of file From c0542a303e7095b3756fb18d32fed8ab5a941c05 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 17:30:16 +0530 Subject: [PATCH 08/25] CICD --- .github/workflows/deploy-backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 226441c..68cc864 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -51,5 +51,5 @@ jobs: image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} region: ${{ env.GAR_LOCATION }} - name: "Use output" - run: 'curl "${{ steps.deploy.outputs.url }}"' + run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file From edf414eea523c9a890b27bcad7bc936105d99921 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 17:40:20 +0530 Subject: [PATCH 09/25] CICD --- .github/workflows/deploy-backend.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 68cc864..7bafee5 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -51,5 +51,4 @@ jobs: image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} region: ${{ env.GAR_LOCATION }} - name: "Use output" - run: 'curl "${{ steps.deploy.outputs.url }}"' - \ No newline at end of file + run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file From c75de44cd715f087249fe209d5d2a12b419b4eca Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 17:46:36 +0530 Subject: [PATCH 10/25] CICD --- .github/workflows/deploy-backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 7bafee5..c9d0538 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -51,4 +51,4 @@ jobs: image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} region: ${{ env.GAR_LOCATION }} - name: "Use output" - run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file + run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file From 32e0482e732099a63e50d062b78e298430cb6a92 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 17:52:49 +0530 Subject: [PATCH 11/25] CICD --- .github/workflows/deploy-backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index c9d0538..7bafee5 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -51,4 +51,4 @@ jobs: image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} region: ${{ env.GAR_LOCATION }} - name: "Use output" - run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file + run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file From 1de5bb9b70e341ba69e1e8a893296f69b8735b69 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 21:52:08 +0530 Subject: [PATCH 12/25] CICD --- .github/workflows/deploy-backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 7bafee5..3495ba8 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -1,11 +1,11 @@ name: Build and Deploy to Google Cloud Run on: + workflow_dispatch: pull_request: paths: - "server/**" - ".github/**" - workflow_dispatch: permissions: id-token: write From 374721e8d8c5f742151fa7d2b70176ad698eefa2 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 22:22:16 +0530 Subject: [PATCH 13/25] CICD --- .github/workflows/deploy-backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 3495ba8..64efb67 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -51,4 +51,4 @@ jobs: image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} region: ${{ env.GAR_LOCATION }} - name: "Use output" - run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file + run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file From f10511af55006e840727b023c3b4251abe8bd327 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 22:29:00 +0530 Subject: [PATCH 14/25] CICD --- .github/workflows/deploy-backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 64efb67..3495ba8 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -51,4 +51,4 @@ jobs: image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} region: ${{ env.GAR_LOCATION }} - name: "Use output" - run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file + run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file From 55a7709420c678794bea8b0b910525184b1bdfd5 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 22:32:30 +0530 Subject: [PATCH 15/25] CICD --- .github/workflows/deploy-backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 3495ba8..64efb67 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -51,4 +51,4 @@ jobs: image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} region: ${{ env.GAR_LOCATION }} - name: "Use output" - run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file + run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file From 2358a655b71c3465b2ec9c95e3c216fc4d41d19b Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 22:38:44 +0530 Subject: [PATCH 16/25] CICD --- .github/workflows/deploy-backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 64efb67..3495ba8 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -51,4 +51,4 @@ jobs: image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} region: ${{ env.GAR_LOCATION }} - name: "Use output" - run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file + run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file From 96a30c426936d4e39140e2b82f1928d9c38e02c6 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sat, 15 Feb 2025 22:45:24 +0530 Subject: [PATCH 17/25] CICD --- .github/workflows/deploy-backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 3495ba8..64efb67 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -51,4 +51,4 @@ jobs: image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} region: ${{ env.GAR_LOCATION }} - name: "Use output" - run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file + run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file From 67cce99d373a896e7e072206332e165d0c1e1888 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sun, 16 Feb 2025 10:02:24 +0530 Subject: [PATCH 18/25] CI CD --- .github/workflows/deploy-backend.yml | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 64efb67..b0953b9 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -2,6 +2,7 @@ name: Build and Deploy to Google Cloud Run on: workflow_dispatch: + pull_request: paths: - "server/**" @@ -38,17 +39,5 @@ jobs: gcloud auth configure-docker ${{ env.GAR_LOCATION }}-docker.pkg.dev - name: "Build and push container" run: |- - docker build -t "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }}" ./server - docker push "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }}" - - name: "Create release name" - run: |- - echo "RELEASE_NAME=${{ env.APP }}-${GITHUB_SHA::7}-${GITHUB_RUN_NUMBER}" >> ${GITHUB_ENV} - - name: "Cloud Run Release" - id: "deploy" - uses: "google-github-actions/deploy-cloudrun@v2" - with: - service: "chatterbox-kunal-staging" - image: ${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:${{ github.sha }} - region: ${{ env.GAR_LOCATION }} - - name: "Use output" - run: 'curl "${{ steps.deploy.outputs.url }}"' \ No newline at end of file + docker build -t "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:staging" ./server + docker push "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:staging" \ No newline at end of file From 0ffe3d4131ec115cfd14205887cf0eebe9997349 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sun, 16 Feb 2025 11:04:26 +0530 Subject: [PATCH 19/25] CICD --- .github/workflows/deploy-backend.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index b0953b9..3a2f7cb 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -40,4 +40,9 @@ jobs: - name: "Build and push container" run: |- docker build -t "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:staging" ./server - docker push "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:staging" \ No newline at end of file + docker push "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:staging" + - name: "Cloud Run Release" + run : |- + gcloud run services describe chatterbox-staging --format export > service.yaml + gcloud run services replace service.yaml + \ No newline at end of file From 954c499e3bb5ddf984feca74cde2f0e413833912 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sun, 16 Feb 2025 11:09:30 +0530 Subject: [PATCH 20/25] CI CD --- .github/workflows/deploy-backend.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index 3a2f7cb..ecb158e 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -43,6 +43,6 @@ jobs: docker push "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:staging" - name: "Cloud Run Release" run : |- - gcloud run services describe chatterbox-staging --format export > service.yaml + gcloud run services describe chatterbox-staging --region ${{ env.GAR_LOCATION }} --format export > service.yaml gcloud run services replace service.yaml \ No newline at end of file From 2c7de5c6c9ed555ea731dc58c21b89f7cd8c88be Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sun, 16 Feb 2025 11:13:31 +0530 Subject: [PATCH 21/25] Add hello route --- server/app/express.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/app/express.ts b/server/app/express.ts index 68b3c63..d9e816d 100644 --- a/server/app/express.ts +++ b/server/app/express.ts @@ -37,4 +37,8 @@ app.get("/user", async (req, res) => { res.send("done"); }); +app.get("/hello", async (req, res) => { + res.send("Hello from chatterbox!"); +}); + export { app }; From 795fa091f009c71006757748a7ea6e133727e0d5 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sun, 16 Feb 2025 22:24:04 +0530 Subject: [PATCH 22/25] Fix BotSVG --- client/src/screens/chat/ChatList.tsx | 3 +-- client/src/vite-env.d.ts | 9 +++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/client/src/screens/chat/ChatList.tsx b/client/src/screens/chat/ChatList.tsx index 075ea48..32cd78f 100644 --- a/client/src/screens/chat/ChatList.tsx +++ b/client/src/screens/chat/ChatList.tsx @@ -47,7 +47,6 @@ function MyListItemText({ chat }: { chat: ChatV2 }) { } function MyListItemAudio({ chat }: { chat: ChatV2 }) { - const audioSrc = `data:audio/webm;base64,${chat.data}`; // console.log(audioURL); return ( @@ -106,7 +105,7 @@ export default function ChatList() { {chat.user.displayName === "Chatterbot" ? ( - + ) : ( (() => { const avatar = createAvatar(thumbs, { diff --git a/client/src/vite-env.d.ts b/client/src/vite-env.d.ts index 11f02fe..67c6e9a 100644 --- a/client/src/vite-env.d.ts +++ b/client/src/vite-env.d.ts @@ -1 +1,10 @@ +declare module "*.svg" { + import * as React from "react"; + + const ReactComponent: React.FunctionComponent< + React.ComponentProps<"svg"> & { title?: string } + >; + + export default ReactComponent; +} /// From 56f464c05c15378ef529ec3d6260c2d63c00be5c Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sun, 16 Feb 2025 22:40:06 +0530 Subject: [PATCH 23/25] Lint --- client/src/screens/auth/index.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/screens/auth/index.tsx b/client/src/screens/auth/index.tsx index ac31233..85681a4 100644 --- a/client/src/screens/auth/index.tsx +++ b/client/src/screens/auth/index.tsx @@ -1,4 +1,4 @@ -import { Box, Button, Container, Divider, Typography } from "@mui/material"; +import { Button, Container, Typography } from "@mui/material"; import HeroSvg from "./HeroSvg.svg"; import { Google } from "@mui/icons-material"; import { @@ -52,7 +52,7 @@ function Auth() { flexDirection: "column", rowGap: 2, my: 1, - maxHeight: 600 + maxHeight: 600, }} > From aefebb87af4ce102bcc2088419e4e62da6ea08f1 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Sun, 16 Feb 2025 22:47:51 +0530 Subject: [PATCH 24/25] Fix inline svg usage --- client/src/screens/auth/index.tsx | 2 +- client/src/screens/chat/ChatList.tsx | 2 +- client/src/vite-env.d.ts | 10 +--------- client/vite.config.ts | 7 +------ 4 files changed, 4 insertions(+), 17 deletions(-) diff --git a/client/src/screens/auth/index.tsx b/client/src/screens/auth/index.tsx index 85681a4..00645d6 100644 --- a/client/src/screens/auth/index.tsx +++ b/client/src/screens/auth/index.tsx @@ -1,5 +1,5 @@ import { Button, Container, Typography } from "@mui/material"; -import HeroSvg from "./HeroSvg.svg"; +import HeroSvg from "./HeroSvg.svg?react"; import { Google } from "@mui/icons-material"; import { GoogleAuthProvider, diff --git a/client/src/screens/chat/ChatList.tsx b/client/src/screens/chat/ChatList.tsx index 32cd78f..9275b18 100644 --- a/client/src/screens/chat/ChatList.tsx +++ b/client/src/screens/chat/ChatList.tsx @@ -1,4 +1,4 @@ -import BotSVG from "../../assets/bot.svg"; +import BotSVG from "../../assets/bot.svg?react"; import { thumbs } from "@dicebear/collection"; import { createAvatar } from "@dicebear/core"; import { diff --git a/client/src/vite-env.d.ts b/client/src/vite-env.d.ts index 67c6e9a..fa3e1b9 100644 --- a/client/src/vite-env.d.ts +++ b/client/src/vite-env.d.ts @@ -1,10 +1,2 @@ -declare module "*.svg" { - import * as React from "react"; - - const ReactComponent: React.FunctionComponent< - React.ComponentProps<"svg"> & { title?: string } - >; - - export default ReactComponent; -} /// +/// \ No newline at end of file diff --git a/client/vite.config.ts b/client/vite.config.ts index 9d93489..ed0239c 100644 --- a/client/vite.config.ts +++ b/client/vite.config.ts @@ -4,10 +4,5 @@ import svgr from "vite-plugin-svgr"; // https://vitejs.dev/config/ export default defineConfig({ - plugins: [ - react(), - svgr({ - include: "**/*.svg", - }), - ], + plugins: [react(), svgr()], }); From 5269fa5be101c2bb625aca7254027d1bf32813c7 Mon Sep 17 00:00:00 2001 From: Kunal Agrawal Date: Mon, 17 Feb 2025 09:59:14 +0530 Subject: [PATCH 25/25] Add Production pipeline for BE --- .../workflows/deploy-backend-production.yml | 48 +++++++++++++++++++ .github/workflows/deploy-backend.yml | 1 - 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/deploy-backend-production.yml diff --git a/.github/workflows/deploy-backend-production.yml b/.github/workflows/deploy-backend-production.yml new file mode 100644 index 0000000..a67010a --- /dev/null +++ b/.github/workflows/deploy-backend-production.yml @@ -0,0 +1,48 @@ +name: Build and Deploy to Google Cloud Run Production + +on: + push: + branches: + - main + paths: + - 'server/**' + workflow_dispatch: + +permissions: + id-token: write + contents: read + +jobs: + build_and_deploy: + runs-on: ubuntu-latest + env: + PROJECT_ID: ${{ secrets.PROJECT_ID }} + APP: chatterbox + REGION: asia-south1 + GAR_LOCATION: asia-south1 + steps: + - name: "Checkout Server Code" + uses: actions/checkout@v4 + with: + sparse-checkout: server + - name: "Google Auth" + uses: "google-github-actions/auth@v2" + with: + workload_identity_provider: "${{ secrets.WIF_PROVIDER }}" + service_account: "${{ secrets.WIF_SERVICE_ACCOUNT }}" + - name: "Set up Cloud SDK" + uses: "google-github-actions/setup-gcloud@v1" + with: + project_id: "${{ secrets.PROJECT_ID }}" + - name: "Docker auth" + run: |- + gcloud auth configure-docker ${{ env.GAR_LOCATION }}-docker.pkg.dev + - name: "Build and push container" + run: |- + docker build -t "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:production" ./server + docker push "${{ env.GAR_LOCATION }}-docker.pkg.dev/${{ env.PROJECT_ID }}/${{ env.APP }}/${{ env.APP }}:production" + - name: "Cloud Run Release" + run : |- + gcloud run services describe my-chat-server --region ${{ env.GAR_LOCATION }} --format export > service.yaml + gcloud run services replace service.yaml + \ No newline at end of file diff --git a/.github/workflows/deploy-backend.yml b/.github/workflows/deploy-backend.yml index ecb158e..d42eed7 100644 --- a/.github/workflows/deploy-backend.yml +++ b/.github/workflows/deploy-backend.yml @@ -6,7 +6,6 @@ on: pull_request: paths: - "server/**" - - ".github/**" permissions: id-token: write