From cecb553d3137c350c127b3278c6ecc291af11172 Mon Sep 17 00:00:00 2001
From: G-Fourteen <gfourteen7525@gmail.com>
Date: Sat, 1 Nov 2025 07:23:54 -0600
Subject: [PATCH] Combine CI checks into main workflow

---
 .github/workflows/main-branch.yml  | 11 +++++++++--
 .github/workflows/pull-request.yml | 26 --------------------------
 2 files changed, 9 insertions(+), 28 deletions(-)
 delete mode 100644 .github/workflows/pull-request.yml

diff --git a/.github/workflows/main-branch.yml b/.github/workflows/main-branch.yml
index 1bb95e3..63b6476 100644
--- a/.github/workflows/main-branch.yml
+++ b/.github/workflows/main-branch.yml
@@ -3,6 +3,13 @@ name: Main Branch Workflow
 on:
   push:
     branches: [main]
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+      - edited
   workflow_dispatch:
 
 permissions:
@@ -34,7 +41,7 @@ jobs:
         run: python .github/scripts/build_static.py
 
       - name: Upload Pages artifact
-        if: steps.build-site.outcome == 'success'
+        if: github.event_name == 'push' && steps.build-site.outcome == 'success'
         uses: actions/upload-pages-artifact@v3
         with:
           path: dist
@@ -181,7 +188,7 @@ jobs:
     name: Deploy to Pages
     runs-on: ubuntu-latest
     needs: build_artifacts
-    if: needs.build_artifacts.outputs.status == 'success'
+    if: github.event_name == 'push' && needs.build_artifacts.outputs.status == 'success'
     environment:
       name: github-pages
     steps:
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
deleted file mode 100644
index 2574fa8..0000000
--- a/.github/workflows/pull-request.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Pull Request Validation
-
-on:
-  pull_request:
-    types: [opened, synchronize, reopened, ready_for_review, edited]
-  workflow_dispatch:
-
-jobs:
-  run-tests:
-    name: Run Tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Python environment
-        uses: ./.github/actions/setup-python-playwright
-
-      - name: Run Tests
-        id: run-tests
-        continue-on-error: true
-        run: python .github/scripts/run_tests.py
-
-      - name: Report Tests Statuses
-        if: always()
-        run: python .github/scripts/write_summary.py --include-tests