Gql gradtrak logic engine

.github/workflows/cd-build.yaml

@@ -33,6 +33,8 @@ jobs:
       - name: Build and Push
         uses: docker/build-push-action@v6
         with:
+          context: .
+          file: ./apps/${{ matrix.image }}/Dockerfile
           target: ${{ matrix.image }}-prod
           tags: ${{ secrets.DOCKER_USERNAME }}/bt-${{ matrix.image }}:${{ inputs.image_tag }}
           cache-from: |

.github/workflows/cd-deploy-docs.yaml

@@ -7,7 +7,7 @@ concurrency:
 on:
   push:
     branches: [master, gql]
-    paths: ["docs/**", "infra/docs/**"]
+    paths: ["apps/docs/**", "infra/docs/**"]
 
 jobs:
   build-push:
@@ -30,7 +30,8 @@ jobs:
       - name: Build and Push
         uses: docker/build-push-action@v6
         with:
-          context: docs
+          context: .
+          file: ./apps/docs/Dockerfile
           target: docs-prod
           tags: ${{ secrets.DOCKER_USERNAME }}/bt-docs:prod
           cache-from: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/bt-docs:prod-cache

.github/workflows/cd-deploy-storybook.yaml

@@ -3,7 +3,13 @@ name: Deploy Storybook
 on:
   push:
     branches: [master, gql]
-    paths: ["packages/common/src/**", ".storybook/**", "Dockerfile", "docker-compose.yml", ".github/workflows/cd-deploy-storybook.yaml", "infra/storybook/**"]
+    paths:
+      [
+        "packages/theme/**",
+        "apps/storybook/**",
+        ".github/workflows/cd-deploy-storybook.yaml",
+        "infra/storybook/**",
+      ]
 
 jobs:
   build-push-image:
@@ -26,7 +32,9 @@ jobs:
       - name: Build and Push
         uses: docker/build-push-action@v6
         with:
+          context: .
           target: storybook-prod
+          file: ./apps/storybook/Dockerfile
           tags: ${{ secrets.DOCKER_USERNAME }}/bt-storybook:prod
           cache-from: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/bt-storybook:prod-cache
           cache-to: type=registry,ref=${{ secrets.DOCKER_USERNAME }}/bt-storybook:prod-cache,mode=max
@@ -56,7 +64,6 @@ jobs:
           helm package storybook --version 0.1.0 --dependency-update
           helm push bt-storybook-0.1.0.tgz oci://registry-1.docker.io/${{ secrets.DOCKER_USERNAME }}
 
-
   deploy:
     name: SSH and Deploy
     needs: [build-push-image, build-push-chart]

.github/workflows/cd-dev.yaml

@@ -1,100 +1,57 @@
-name: Deploy to Development
-
-concurrency:
-  group: dev-${{ github.ref }}
-  cancel-in-progress: true
+name: Deploy to Dev
 
 on:
   workflow_dispatch:
     inputs:
       ttl:
-        description: "Deployment time to live in hours"
+        description: "Deployment time to live in seconds"
         required: true
         type: number
-        default: 1
+        default: 86400
 
 jobs:
-  compute-sha:
-    name: Compute sha_short
+  deploy:
     runs-on: ubuntu-latest
-    outputs:
-      sha_short: ${{ steps.vars.outputs.sha_short }}
 
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
       - name: Set vars
         id: vars
-        run: |
-          echo "sha_short=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_OUTPUT
+        run: echo "sha_short=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
 
-  build-push:
-    name: Build and Push Images and Charts
-    needs: [compute-sha]
-    uses: ./.github/workflows/cd-build.yaml
-    with:
-      image_tag: ${{ needs.compute-sha.outputs.sha_short }}
-      chart_ver: 0.1.0-dev-${{ needs.compute-sha.outputs.sha_short }}
-    secrets: inherit
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-  deploy:
-    name: SSH and Deploy
-    needs: [compute-sha, build-push]
-    uses: ./.github/workflows/cd-deploy.yaml
-    with:
-      environment: development
-      name: bt-dev-app-${{ needs.compute-sha.outputs.sha_short }}
-      version: 0.1.0-dev-${{ needs.compute-sha.outputs.sha_short }}
-      values: |
-        env: dev
-        ttl: ${{ inputs.ttl }}
-        frontend:
-          image:
-            tag: '${{ needs.compute-sha.outputs.sha_short }}'
-        backend:
-          image:
-            tag: '${{ needs.compute-sha.outputs.sha_short }}'
-        datapuller:
-          suspend: true
-          image:
-            tag: '${{ needs.compute-sha.outputs.sha_short }}'
-        host: ${{ needs.compute-sha.outputs.sha_short }}.dev.stanfurdtime.com
-        mongoUri: mongodb://bt-dev-mongo-mongodb-0.bt-dev-mongo-mongodb-headless.bt.svc.cluster.local:27017/bt
-        redisUri: redis://bt-dev-redis-master.bt.svc.cluster.local:6379
-      host: ${{ needs.compute-sha.outputs.sha_short }}.dev.stanfurdtime.com
-    secrets: inherit
+      - name: Build Images with Tags
+        run: |
+          docker build --target backend-dev --tag "${{ secrets.DOCKER_USERNAME }}/bt-backend:${{ env.sha_short }}" .
+          docker build --target frontend-dev --tag "${{ secrets.DOCKER_USERNAME }}/bt-frontend:${{ env.sha_short }}" .
 
-  limit-deploy:
-    name: SSH and Limit Deployments
-    needs: [deploy]
-    runs-on: ubuntu-latest
-    steps:
-      - name: SSH and Check Deployments
-        uses: appleboy/ssh-action@v1.2.0
+      - name: Push Images to Docker Hub
+        run: |
+          docker push "${{ secrets.DOCKER_USERNAME }}/bt-backend:${{ env.sha_short }}"
+          docker push "${{ secrets.DOCKER_USERNAME }}/bt-frontend:${{ env.sha_short }}"
+
+      - name: SSH and Helm Install
+        uses: appleboy/ssh-action@v1.0.3
         with:
           host: ${{ secrets.SSH_HOST }}
-          username: ${{ secrets.SSH_USERNAME }}
+          username: root
           key: ${{ secrets.SSH_KEY }}
           script: |
-            set -e  # Exit immediately if a command fails
-
-            # Get bt-dev-app- deployments sorted by creation timestamp
-            deployments=$(helm list \
-              --namespace=bt \
-              --date \
-              --short | grep '^bt-dev-app') || true
-            deployment_count=$(echo "$deployments" | wc -l)
-
-            # Check if deployment count > 8
-            if [ "$deployment_count" -gt 8 ]; then
-              echo "Too many deployments. Deleting the oldest deployment."
-
-              # Get oldest deployment from first line of deployments
-              oldest_deployment=$(echo "$deployments" | head -n 1)
-
-              # Uninstall deployment
-              helm uninstall "${oldest_deployment}"
-            else
-              echo "Deployment count is <= 8."
-            fi
+            cd ./infra
+            helm uninstall bt-dev-app-${{ env.sha_short }} || true
+            helm install bt-dev-app-${{ env.sha_short }} ./app --namespace=bt \
+              --set env=dev \
+              --set ttl=${{ inputs.ttl }} \
+              --set frontend.image.tag=${{ env.sha_short }} \
+              --set backend.image.tag=${{ env.sha_short }} \
+              --set host=${{ env.sha_short }}.stanfurdtime.com \
+              --set mongoUri=mongodb://bt-dev-mongo-mongodb.bt.svc.cluster.local:27017/bt \
+              --set redisUri=redis://bt-dev-redis-master.bt.svc.cluster.local:6379 \
+              --set nodeEnv=development

.github/workflows/cd-prod.yaml

@@ -1,38 +1,129 @@
 name: Deploy to Production
 
-concurrency: production
+concurrency: prod
 
 on:
   workflow_dispatch:
 
+env:
+  artifact-retention-days: 7
+
 jobs:
   branch-check:
-    name: Environment Check
+    name: Check Branch
     runs-on: ubuntu-latest
-    environment: production
+    environment: prod
 
     steps:
       - name: Pass
         run: echo "Passed check"
 
-  build-push:
-    name: Build and Push Images and Charts
-    needs: [branch-check]
-    uses: ./.github/workflows/cd-build.yaml
-    with:
-      image_tag: prod
-      chart_ver: "1.0.0"
-    secrets: inherit
+  build-backend:
+    name: Build Backend Image
+    needs: branch-check
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Build Image with Tag
+        run: |
+          docker build --target backend-prod --tag "${{ secrets.DOCKER_USERNAME }}/bt-backend:prod" .
+          docker save "${{ secrets.DOCKER_USERNAME }}/bt-backend:prod" --output "bt-backend-prod.tar"
+
+      - name: Upload Image as Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: "bt-backend-prod.tar"
+          path: "bt-backend-prod.tar"
+          retention-days: ${{ env.artifact-retention-days }}
+          overwrite: true
+
+  build-frontend:
+    name: Build Frontend Image
+    needs: branch-check
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - name: Build Image with Tag
+        run: |
+          docker build --target frontend-prod --tag "${{ secrets.DOCKER_USERNAME }}/bt-frontend:prod" .
+          docker save "${{ secrets.DOCKER_USERNAME }}/bt-frontend:prod" --output "bt-frontend-prod.tar"
+
+      - name: Upload Image as Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: "bt-frontend-prod.tar"
+          path: "bt-frontend-prod.tar"
+          retention-days: ${{ env.artifact-retention-days }}
+          overwrite: true
+
+  push-backend:
+    name: Push Backend Image
+    needs: build-backend
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Download Artifact as Image
+        uses: actions/download-artifact@v4
+        with:
+          name: "bt-backend-prod.tar"
+
+      - name: Push Image to Docker Hub
+        run: |
+          docker import "bt-backend-prod.tar" "${{ secrets.DOCKER_USERNAME }}/bt-backend:prod"
+          docker push "${{ secrets.DOCKER_USERNAME }}/bt-backend:prod"
+
+  push-frontend:
+    name: Push Frontend Image
+    needs: build-frontend
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Download Artifact as Image
+        uses: actions/download-artifact@v4
+        with:
+          name: "bt-frontend-prod.tar"
+
+      - name: Push Image to Docker Hub
+        run: |
+          docker import "bt-frontend-prod.tar" "${{ secrets.DOCKER_USERNAME }}/bt-frontend:prod"
+          docker push "${{ secrets.DOCKER_USERNAME }}/bt-frontend:prod"
 
   deploy:
-    name: SSH and Deploy
-    needs: [build-push]
-    uses: ./.github/workflows/cd-deploy.yaml
-    with:
-      environment: production
-      name: bt-prod-app
-      version: "1.0.0"
-      values: |
-        host: beta.berkeleytime.com
-      host: beta.berkeleytime.com
-    secrets: inherit
+    name: Deploy with SSH
+    needs: [push-backend, push-frontend]
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: SSH and Helm Install
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: root
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            cd ./infra
+            if helm status bt-prod-app ; then
+              kubectl rollout restart bt-prod-app-backend
+              kubectl rollout restart bt-prod-app-frontend
+            else
+              helm install bt-prod-app ./app --namespace=bt \
+                --set host=stanfurdtime.com
+            fi