From d8713d66b57c7512517852c0251099438a527ff0 Mon Sep 17 00:00:00 2001
From: Abdulbari <abdulbari@noreply.blc-css.com>
Date: Thu, 30 Oct 2025 19:36:50 +0300
Subject: [PATCH 1/7] Update .gitea/workflows/sgeupdated.yml

---
 .gitea/workflows/sgeupdated.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitea/workflows/sgeupdated.yml b/.gitea/workflows/sgeupdated.yml
index 1e8a5ee..e3cf264 100644
--- a/.gitea/workflows/sgeupdated.yml
+++ b/.gitea/workflows/sgeupdated.yml
@@ -1,15 +1,15 @@
 name: sgeUpdated CI/CD
 
 on:
-  push:
-    branches:
-      - main
   pull_request:
+    types:
+      - closed     # Fires when a PR is closed (either merged or manually closed)
     branches:
-      - main 
-      
+      - main       # Only when PR targets main
+
 jobs:
   deploy:
+    if: github.event.pull_request.merged == true    # Run only if the PR was merged (not just closed)
     runs-on: ubuntu-latest
 
     steps:
@@ -23,7 +23,7 @@ jobs:
       - name: Run deploy script on server
         run: |
           ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF'
-            echo "✅ Connected to server. Running deploy script..."
+            echo "✅ PR merged into main — running deploy script..."
             cd /home/ubuntu/Bgreen/sgeUpdated
             ./deploy.sh
           EOF
-- 
2.49.1


From 893aef74db9c592e256fc089235eada0cbbc480c Mon Sep 17 00:00:00 2001
From: Abdulbari <abdulbari@noreply.blc-css.com>
Date: Thu, 30 Oct 2025 19:37:31 +0300
Subject: [PATCH 2/7] Update sge-backend/pom.xml

---
 sge-backend/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sge-backend/pom.xml b/sge-backend/pom.xml
index d184823..e83965d 100644
--- a/sge-backend/pom.xml
+++ b/sge-backend/pom.xml
@@ -11,7 +11,7 @@
     </parent>
     <groupId>com.sgs</groupId>
     <artifactId>sgs</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>0.0.4-SNAPSHOT</version>
     <name>sgs</name>
     <description>SGS project for Spring Boot</description>
     <properties>
-- 
2.49.1


From 554a50b1d20d386a9200bb10381fddf353f9d87e Mon Sep 17 00:00:00 2001
From: Abdulbari <abdulbari@noreply.blc-css.com>
Date: Thu, 30 Oct 2025 19:46:38 +0300
Subject: [PATCH 3/7] Update sge-frontend/package.json

---
 sge-frontend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sge-frontend/package.json b/sge-frontend/package.json
index c43d6c8..bee772e 100644
--- a/sge-frontend/package.json
+++ b/sge-frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sgs-web",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.13.8",
-- 
2.49.1


From 8639fdf1aee069170c6f725d9e74f4154e98a337 Mon Sep 17 00:00:00 2001
From: Abdulbari <abdulbari@noreply.blc-css.com>
Date: Thu, 30 Oct 2025 19:55:44 +0300
Subject: [PATCH 4/7] Update .gitea/workflows/sgeupdated.yml

---
 .gitea/workflows/sgeupdated.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/sgeupdated.yml b/.gitea/workflows/sgeupdated.yml
index e3cf264..1e8a5ee 100644
--- a/.gitea/workflows/sgeupdated.yml
+++ b/.gitea/workflows/sgeupdated.yml
@@ -1,15 +1,15 @@
 name: sgeUpdated CI/CD
 
 on:
-  pull_request:
-    types:
-      - closed     # Fires when a PR is closed (either merged or manually closed)
+  push:
     branches:
-      - main       # Only when PR targets main
-
+      - main
+  pull_request:
+    branches:
+      - main 
+      
 jobs:
   deploy:
-    if: github.event.pull_request.merged == true    # Run only if the PR was merged (not just closed)
     runs-on: ubuntu-latest
 
     steps:
@@ -23,7 +23,7 @@ jobs:
       - name: Run deploy script on server
         run: |
           ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF'
-            echo "✅ PR merged into main — running deploy script..."
+            echo "✅ Connected to server. Running deploy script..."
             cd /home/ubuntu/Bgreen/sgeUpdated
             ./deploy.sh
           EOF
-- 
2.49.1


From c47764c006828b2eff18375de4c2e5adb5b450b7 Mon Sep 17 00:00:00 2001
From: Abdulbari <abdulbari@noreply.blc-css.com>
Date: Thu, 30 Oct 2025 19:57:50 +0300
Subject: [PATCH 5/7] Update sge-backend/pom.xml

---
 sge-backend/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sge-backend/pom.xml b/sge-backend/pom.xml
index e83965d..8130528 100644
--- a/sge-backend/pom.xml
+++ b/sge-backend/pom.xml
@@ -11,7 +11,7 @@
     </parent>
     <groupId>com.sgs</groupId>
     <artifactId>sgs</artifactId>
-    <version>0.0.4-SNAPSHOT</version>
+    <version>0.0.1-SNAPSHOT</version>
     <name>sgs</name>
     <description>SGS project for Spring Boot</description>
     <properties>
-- 
2.49.1


From 1c6272ebe71966e77811eda88a50a86a99e4261a Mon Sep 17 00:00:00 2001
From: Abdulbari <abdulbari@noreply.blc-css.com>
Date: Thu, 30 Oct 2025 19:58:49 +0300
Subject: [PATCH 6/7] Update sge-backend/pom.xml

---
 sge-backend/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sge-backend/pom.xml b/sge-backend/pom.xml
index 8130528..d184823 100644
--- a/sge-backend/pom.xml
+++ b/sge-backend/pom.xml
@@ -11,7 +11,7 @@
     </parent>
     <groupId>com.sgs</groupId>
     <artifactId>sgs</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
     <name>sgs</name>
     <description>SGS project for Spring Boot</description>
     <properties>
-- 
2.49.1


From 4e10960394e6680d2b5b25b1f8d538b2ab9255fe Mon Sep 17 00:00:00 2001
From: Abdulbari <abdulbari@noreply.blc-css.com>
Date: Thu, 30 Oct 2025 20:00:28 +0300
Subject: [PATCH 7/7] Update sge-frontend/package.json

---
 sge-frontend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sge-frontend/package.json b/sge-frontend/package.json
index bee772e..263dbb1 100644
--- a/sge-frontend/package.json
+++ b/sge-frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sgs-web",
-  "version": "1.0.4",
+  "version": "1.0.3",
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.13.8",
-- 
2.49.1