From c27cd80dfd00d2a2934bede68b19b6cfca9272c5 Mon Sep 17 00:00:00 2001
From: hizumi <hizumi@noreply.iceberg-gaming.com>
Date: Wed, 11 Feb 2026 21:57:26 -0600
Subject: [PATCH] update ci /cd system

simplify setup and add a merge check
---
 .../{ci-deploy.yaml => deploy-dev.yaml}       | 12 +++-
 .../{cd-deploy.yaml => deploy-prod.yaml}      |  6 +-
 .gitea/workflows/pull-request.yaml            | 58 +++++++++++++++++++
 3 files changed, 70 insertions(+), 6 deletions(-)
 rename .gitea/workflows/{ci-deploy.yaml => deploy-dev.yaml} (84%)
 rename .gitea/workflows/{cd-deploy.yaml => deploy-prod.yaml} (93%)
 create mode 100644 .gitea/workflows/pull-request.yaml

diff --git a/.gitea/workflows/ci-deploy.yaml b/.gitea/workflows/deploy-dev.yaml
similarity index 84%
rename from .gitea/workflows/ci-deploy.yaml
rename to .gitea/workflows/deploy-dev.yaml
index 95ebb3d..9c057b1 100644
--- a/.gitea/workflows/ci-deploy.yaml
+++ b/.gitea/workflows/deploy-dev.yaml
@@ -1,11 +1,11 @@
-name: Continuous Integration
+name: Testing Site CD
 on:
   push:
     branches:
       - main
 
 jobs:
-  Deploy:
+  deploy-testing-cd:
     name: Update Development
     runs-on: ubuntu-latest
     container:
@@ -40,14 +40,20 @@ jobs:
       - name: Token Copy
         run: |
           cd /var/www/html/milsim-site-v4
-          cp /workspace/17th-Ranger-Battalion-ORG/milsim-site-v4/.git/config .git/config
+          cp ${{ gitea.workspace }}/.git/config .git/config
           chown nginx:nginx .git/config
 
       - name: Update Application Code
         run: |
           cd /var/www/html/milsim-site-v4
+          version=`git log -1 --format=%H`
+          echo "Current Revision: $version"
+          echo "Updating to: ${{ github.sha }}"
           sudo -u nginx git reset --hard
+          sudo -u nginx git fetch --tags
           sudo -u nginx git pull origin main
+          new_version=`git log -1 --format=%H`
+          echo "Successfully updated to: $new_version"
 
       - name: Update Shared Dependencies and Fix Permissions
         run: |
diff --git a/.gitea/workflows/cd-deploy.yaml b/.gitea/workflows/deploy-prod.yaml
similarity index 93%
rename from .gitea/workflows/cd-deploy.yaml
rename to .gitea/workflows/deploy-prod.yaml
index 8ee90f4..fa33881 100644
--- a/.gitea/workflows/cd-deploy.yaml
+++ b/.gitea/workflows/deploy-prod.yaml
@@ -1,11 +1,11 @@
-name: Continuous Deployment
+name: Live Site CD
 on:
   push:
     tags:
       - '*'
 
 jobs:
-  Deploy:
+  deploy-live-cd:
     name: Update Deployment
     runs-on: ubuntu-latest
     container:
@@ -40,7 +40,7 @@ jobs:
       - name: Token Copy
         run: |
           cd /var/www/html/milsim-site-v4
-          cp /workspace/17th-Ranger-Battalion-ORG/milsim-site-v4/.git/config .git/config
+          cp ${{ gitea.workspace }}/.git/config .git/config
           chown nginx:nginx .git/config
 
       - name: Update Application Code
diff --git a/.gitea/workflows/pull-request.yaml b/.gitea/workflows/pull-request.yaml
new file mode 100644
index 0000000..c3314b6
--- /dev/null
+++ b/.gitea/workflows/pull-request.yaml
@@ -0,0 +1,58 @@
+name: Pull Request CI
+on:
+ pull_request:
+  branches: 
+    - main
+  types: 
+    - opened
+    - synchronize
+    - reopened
+
+jobs:
+  build:
+    name: Update Deployment
+    runs-on: ubuntu-latest
+    container:
+    steps:
+      - name: Update Node Environment
+        uses: actions/setup-node@v6
+        with:
+          node-version: 20.19
+
+      - name: Verify Local Environment
+        run: |
+          which npm
+          npm -v
+          which node
+          node -v
+
+      - name: Checkout
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+          ref: 'main'
+
+      - name: Install Shared Dependencies
+        run: |
+          cd ${{ gitea.workspace }}/shared
+          npm install
+
+      - name: Install UI Dependencies
+        run: |
+          cd ${{ gitea.workspace }}/ui
+          npm install
+
+      - name: Install API Dependencies
+        run: |
+          cd ${{ gitea.workspace }}/api
+          npm install
+
+      - name: Build UI
+        run: |
+          cd ${{ gitea.workspace }}/ui
+          npm run build
+
+      - name: Build API
+        run: |
+          cd ${{ gitea.workspace }}/api
+          npm run build