From d134a78f42f8b493a72aadf98c28036e5f9afdad Mon Sep 17 00:00:00 2001
From: david <david@pop-os.localdomain>
Date: Thu, 3 Apr 2025 20:54:31 -0700
Subject: [PATCH 1/6] screen test

---
 .gitea/workflows/deploy.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 7b0f64a..cc18382 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - dev
 
 jobs:
   deploy:
@@ -16,15 +17,17 @@ jobs:
           git checkout $GITEA_REF_NAME
           git pull origin $GITEA_REF_NAME
 
-      - name: Stop existing server, if running
+      - name: Stop existing screen session, if running
         run: |
-          pkill -f 'python3 -m http.server' || true
+          if screen -list | grep -q "personal_site_server_$GITEA_REF_NAME"; then
+            echo "Stopping existing screen session..."
+            screen -S personal_site_server -X quit
+          fi
 
-      - name: Start server
+      - name: Start server in screen session
         run: |
           cd ~/personal-site
           chmod +x ./start.sh
           sassc css/style.scss css/style.css
-          nohup python3 -m http.server 8080 > server.log 2>&1 &
-          disown
-          echo "Server started in background"
+          screen -dmS personal_site_server bash -c 'python3 -m http.server 8081 > server.log 2>&1'
+          echo "Server started in detached screen session"
-- 
2.39.5


From 3c55a048b4e172dba8ade4742b0bc216fe0cf829 Mon Sep 17 00:00:00 2001
From: david <david@pop-os.localdomain>
Date: Thu, 3 Apr 2025 21:00:27 -0700
Subject: [PATCH 2/6] setsid

---
 .gitea/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index cc18382..2149219 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -29,5 +29,5 @@ jobs:
           cd ~/personal-site
           chmod +x ./start.sh
           sassc css/style.scss css/style.css
-          screen -dmS personal_site_server bash -c 'python3 -m http.server 8081 > server.log 2>&1'
+          setsid screen -dmS personal_site_server bash -c 'python3 -m http.server 8081 > server.log 2>&1'
           echo "Server started in detached screen session"
-- 
2.39.5


From b9267e4d7e6204d4e137ae466dad87b8577bf4b7 Mon Sep 17 00:00:00 2001
From: david <david@pop-os.localdomain>
Date: Thu, 3 Apr 2025 21:01:05 -0700
Subject: [PATCH 3/6] change order

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index c383f7f..1e90929 100644
--- a/index.html
+++ b/index.html
@@ -26,8 +26,8 @@
     </div>
     <h2>Projects</h2>
     <h2>Travel</h2>
-    <h2>Games</h2>
     <h2>Media</h2>
+    <h2>Games</h2>
   </main>
   <footer>
     <p>2025 David Westgate</p>
-- 
2.39.5


From db71baf12b9db422db77cd476c3bec2f4c2b9ddc Mon Sep 17 00:00:00 2001
From: david <david@pop-os.localdomain>
Date: Thu, 3 Apr 2025 21:04:33 -0700
Subject: [PATCH 4/6] cleanup

---
 .gitea/workflows/deploy.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 2149219..7a30883 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -19,7 +19,7 @@ jobs:
 
       - name: Stop existing screen session, if running
         run: |
-          if screen -list | grep -q "personal_site_server_$GITEA_REF_NAME"; then
+          if screen -list | grep -q "personal_site_server"; then
             echo "Stopping existing screen session..."
             screen -S personal_site_server -X quit
           fi
@@ -29,5 +29,5 @@ jobs:
           cd ~/personal-site
           chmod +x ./start.sh
           sassc css/style.scss css/style.css
-          setsid screen -dmS personal_site_server bash -c 'python3 -m http.server 8081 > server.log 2>&1'
+          setsid screen -dmS personal_site_server bash -c 'python3 -m http.server 8080 > server.log 2>&1'
           echo "Server started in detached screen session"
-- 
2.39.5


From 870820867317556876844732e50fe1f46e18ce7b Mon Sep 17 00:00:00 2001
From: david <david@pop-os.localdomain>
Date: Thu, 3 Apr 2025 21:06:09 -0700
Subject: [PATCH 5/6] add fetch step

---
 .gitea/workflows/deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 7a30883..54d2c2d 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -14,6 +14,7 @@ jobs:
       - name: Checkout code
         run: |
           cd ~/personal-site
+          git fetch
           git checkout $GITEA_REF_NAME
           git pull origin $GITEA_REF_NAME
 
-- 
2.39.5


From 563ec99fc697c936d859bc2d2cc0a22b7b6aac07 Mon Sep 17 00:00:00 2001
From: david <david@pop-os.localdomain>
Date: Thu, 3 Apr 2025 21:08:16 -0700
Subject: [PATCH 6/6] screen approach

---
 .gitea/workflows/deploy.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 54d2c2d..ed05da5 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - dev
 
 jobs:
   deploy:
@@ -15,8 +14,8 @@ jobs:
         run: |
           cd ~/personal-site
           git fetch
-          git checkout $GITEA_REF_NAME
-          git pull origin $GITEA_REF_NAME
+          git checkout main
+          git pull origin main
 
       - name: Stop existing screen session, if running
         run: |
-- 
2.39.5