From 1475c7911f51420801e795d3ad671f2a4d3146ec Mon Sep 17 00:00:00 2001
From: Alex Savin <alex@savin.nyc>
Date: Tue, 29 Apr 2025 22:47:34 -0400
Subject: [PATCH] Updated CI.yml and CD.yml

---
 .github/workflows/CD.yml | 52 +++++++++++++++++++++++++++-------------
 .github/workflows/CI.yml | 10 ++++++--
 2 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml
index 7617614..b364dc8 100644
--- a/.github/workflows/CD.yml
+++ b/.github/workflows/CD.yml
@@ -13,28 +13,49 @@ on:
         required: false
 
 jobs:
-  # on-success:
-  #   runs-on: ubuntu-latest
-  #   if: ${{ github.event.workflow_run.conclusion == 'success' }}
-  #   steps:
-  #     - run: echo "First workflow was a success"
-
-  # on-failure:
-  #   runs-on: ubuntu-latest
-  #   if: ${{ github.event.workflow_run.conclusion == 'failure' }}
-  #   steps:
-  #     - run: echo "First workflow was a failure"
-
   deploy:
     runs-on: ubuntu-latest
-    # if: ${{ github.event.workflow_run.conclusion == 'success' }}
     steps:
-      # - uses: actions/checkout@v4
 
       # - name: Dump inputs context
       #   env:
       #     INPUTS_CONTEXT: ${{ toJson(inputs) }}
 
+      - name: Dump Inputs context
+        env:
+          INPUTS_CONTEXT: ${{ toJson(inputs) }}
+        run: echo "$INPUTS_CONTEXT"
+
+      - name: Dump GitHub context
+        env:
+          GITHUB_CONTEXT: ${{ toJson(github) }}
+        run: echo "$GITHUB_CONTEXT"
+
+      - name: Dump job context
+        env:
+          JOB_CONTEXT: ${{ toJson(job) }}
+        run: echo "$JOB_CONTEXT"
+
+      - name: Dump steps context
+        env:
+          STEPS_CONTEXT: ${{ toJson(steps) }}
+        run: echo "$STEPS_CONTEXT"
+
+      - name: Dump runner context
+        env:
+          RUNNER_CONTEXT: ${{ toJson(runner) }}
+        run: echo "$RUNNER_CONTEXT"
+
+      - name: Dump strategy context
+        env:
+          STRATEGY_CONTEXT: ${{ toJson(strategy) }}
+        run: echo "$STRATEGY_CONTEXT"
+
+      - name: Dump matrix context
+        env:
+          MATRIX_CONTEXT: ${{ toJson(matrix) }}
+        run: echo "$MATRIX_CONTEXT"
+
       - name: Setup SSH
         shell: bash
         run: |
@@ -50,6 +71,5 @@ jobs:
       - name: SSH to the Prod env
         shell: bash 
         run: |
-          ssh -tt -o StrictHostKeyChecking=no gitea@${{secrets.SSH_HOST}} 'whoami'
           ssh -tt -o StrictHostKeyChecking=no gitea@${{secrets.SSH_HOST}} 'docker pull docker.savin.nyc/go-receipt-tracker:nightly'
-   
\ No newline at end of file
+          ssh -tt -o StrictHostKeyChecking=no gitea@${{secrets.SSH_HOST}} 'cd /opt/projects/receipt-tracker && docker compose down --remove-orphans && docker compose up -d'
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index c05a228..2df4133 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -18,8 +18,6 @@ on:
       - develop
     paths-ignore:
       - 'README.md'
-#      - '.github/**'
-
 
 jobs:
 
@@ -44,6 +42,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ testing ]
     steps:
+
       - name: Extract Version
         id: version_step
         run: |
@@ -51,14 +50,17 @@ jobs:
           echo REPO_VERSION=${GITHUB_REF_NAME#v} >> $GITHUB_OUTPUT
           echo RELEASE_DATE=$(date --rfc-3339=date) >> ${GITHUB_ENV}
           echo COMMIT_SHA_SHORT=$(echo ${{ github.sha }} | cut -c1-10) >> $GITHUB_OUTPUT
+
       - name: Dump GitHub context
         env:
           GITHUB_CONTEXT: ${{ toJson(github) }}
         run: echo "$GITHUB_CONTEXT"
+
       - name: Dump job context
         env:
           JOB_CONTEXT: ${{ toJson(job) }}
         run: echo "$JOB_CONTEXT"
+
       - name: Dump steps context
         env:
           STEPS_CONTEXT: ${{ toJson(steps) }}
@@ -70,13 +72,16 @@ jobs:
       #   run: |
       #     echo ${{steps.version_step.outputs.version_tag}}
       #     echo ${{steps.version_step.outputs.latest_tag}}
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker BuildX
         uses: docker/setup-buildx-action@v3
         with:
           platforms: |
             linux/amd64
+
       - name: Login to DockerHub
         uses: docker/login-action@v3
         with:
@@ -88,6 +93,7 @@ jobs:
       #   run: |
       #     echo VERSION_TAG=$(echo ${{ steps.version_step.outputs.version_tag }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
       #     echo LASTEST_TAG=$(echo ${{ steps.version_step.outputs.latest_tag  }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
+
       - name: Build and Push
         id: docker_build
         uses: docker/build-push-action@v6