From 5591877f99c5d1d5d2735eb11b6fb53a5447f063 Mon Sep 17 00:00:00 2001
From: Gregory Campbell <gjcampbell777@users.noreply.github.com>
Date: Thu, 11 Jun 2026 21:55:37 -0400
Subject: [PATCH] Corrected workflow branch selection

---
 .github/workflows/amplify-deploy.yml        | 45 ---------------------
 .github/workflows/codeql-analysis.yml       |  2 +-
 .github/workflows/frontend-deploy.yml       | 29 +++++++++----
 .github/workflows/go-backend-deploy.yml     |  2 +-
 .github/workflows/python-backend-deploy.yml |  2 +-
 .github/workflows/rust-backend-deploy.yml   |  2 +-
 .github/workflows/test-pipeline-deploy.yml  |  2 +-
 7 files changed, 26 insertions(+), 58 deletions(-)
 delete mode 100644 .github/workflows/amplify-deploy.yml

diff --git a/.github/workflows/amplify-deploy.yml b/.github/workflows/amplify-deploy.yml
deleted file mode 100644
index 893057770..000000000
--- a/.github/workflows/amplify-deploy.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-name: CI/CD for React to AWS Amplify
-
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  # Testing (Runs automatically on push/PR)
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Set up Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: 24
-
-      - name: Install dependencies
-        run: npm ci --legacy-peer-deps
-
-      - name: Run Linter
-        run: npm run lint --if-present
-
-      - name: Run Tests
-        run: npm test -- --watchAll=false
-
-  # Deployment (Waits for manual approval after 'test' passes)
-  deploy:
-    runs-on: ubuntu-latest
-    needs: test
-    environment: production
-
-    steps:
-      - name: Trigger webhook using curl
-        env:
-          WEBHOOK_URL: ${{ secrets.AMPLIFY_WEBHOOK_URL }}
-        run: |
-          curl -i --fail -X POST -H "Content-Type: application/json" -d '{}' "$WEBHOOK_URL"
\ No newline at end of file
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 50ba2a1a1..c1df31d1c 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        language: [ 'javascript' ]
+        language: [ 'javascript', 'python', 'go' ]
         # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
         # Learn more:
         # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
diff --git a/.github/workflows/frontend-deploy.yml b/.github/workflows/frontend-deploy.yml
index 673035b76..109583e95 100644
--- a/.github/workflows/frontend-deploy.yml
+++ b/.github/workflows/frontend-deploy.yml
@@ -2,24 +2,24 @@ name: Frontend Deploy
 
 on:
   push:
-    branches: [main]
+    branches: [master]
     paths:
       - 'frontend/**'
       - '.github/workflows/frontend-deploy.yml'
   workflow_dispatch:
 
 jobs:
-  build-and-deploy:
+  test:
     runs-on: ubuntu-latest
     defaults:
       run:
         working-directory: frontend
 
     steps:
-      - name: Checkout source
+      - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Setup Node.js
+      - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
           node-version: '20'
@@ -29,8 +29,21 @@ jobs:
       - name: Install dependencies
         run: npm ci --legacy-peer-deps
 
-      - name: Build frontend
-        run: npm run build
+      - name: Run Linter
+        run: npm run lint --if-present
 
-      - name: Deploy placeholder
-        run: echo "Deploy the frontend build to AWS Amplify or CloudFront from this step."
+      - name: Run Tests
+        run: npm test -- --watchAll=false
+
+  # Deployment (Waits for manual approval after 'test' passes)
+  deploy:
+    runs-on: ubuntu-latest
+    needs: test
+    environment: production
+
+    steps:
+      - name: Trigger webhook using curl
+        env:
+          WEBHOOK_URL: ${{ secrets.AMPLIFY_WEBHOOK_URL }}
+        run: |
+          curl -i --fail -X POST -H "Content-Type: application/json" -d '{}' "$WEBHOOK_URL"
diff --git a/.github/workflows/go-backend-deploy.yml b/.github/workflows/go-backend-deploy.yml
index d1004aefc..14397f36d 100644
--- a/.github/workflows/go-backend-deploy.yml
+++ b/.github/workflows/go-backend-deploy.yml
@@ -2,7 +2,7 @@ name: Go Backend Deploy
 
 on:
   push:
-    branches: [main]
+    branches: [master]
     paths:
       - 'backend-go/**'
       - '.github/workflows/go-backend-deploy.yml'
diff --git a/.github/workflows/python-backend-deploy.yml b/.github/workflows/python-backend-deploy.yml
index 6d14f6542..b4bb1dd55 100644
--- a/.github/workflows/python-backend-deploy.yml
+++ b/.github/workflows/python-backend-deploy.yml
@@ -2,7 +2,7 @@ name: Python Backend Deploy
 
 on:
   push:
-    branches: [main]
+    branches: [master]
     paths:
       - 'backend-python/**'
       - '.github/workflows/python-backend-deploy.yml'
diff --git a/.github/workflows/rust-backend-deploy.yml b/.github/workflows/rust-backend-deploy.yml
index 771eb2434..c1486560a 100644
--- a/.github/workflows/rust-backend-deploy.yml
+++ b/.github/workflows/rust-backend-deploy.yml
@@ -2,7 +2,7 @@ name: Rust Backend Deploy
 
 on:
   push:
-    branches: [main]
+    branches: [master]
     paths:
       - 'backend-rust/**'
       - '.github/workflows/rust-backend-deploy.yml'
diff --git a/.github/workflows/test-pipeline-deploy.yml b/.github/workflows/test-pipeline-deploy.yml
index 3d727033b..073adab58 100644
--- a/.github/workflows/test-pipeline-deploy.yml
+++ b/.github/workflows/test-pipeline-deploy.yml
@@ -2,7 +2,7 @@ name: Test Pipeline Deploy
 
 on:
   push:
-    branches: [main]
+    branches: [master]
     paths:
       - 'pipeline-testing/**'
       - '.github/workflows/test-pipeline-deploy.yml'