merge upstream

.gitea/workflows/sgeupdated.yml

@@ -22,6 +22,8 @@ jobs:
 
       - name: Run deploy script on server
         run: |
-          # We add -tt to force a pseudo-terminal (fixes that stdin error)
-          # We call bash -lc to force a Login Shell, which loads your credentials
-          ssh -tt ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} "bash -lc 'cd /home/ubuntu/Bgreen/sgeUpdated && ./deploy.sh'"
+          ssh ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_HOST }} << 'EOF'
+            echo "✅ PR merged into main — running deploy script..."
+            cd /home/ubuntu/Bgreen/sgeUpdated
+            ./deploy.sh
+          EOF

deploy.sh

@@ -6,13 +6,13 @@ cd /home/ubuntu/Bgreen/sgeUpdated
 # -----------------------
 # Harbor settings
 # -----------------------
-HARBOR_REGISTRY="10.10.100.110:8085"
+HARBOR_REGISTRY="10.150.1.166"
 HARBOR_PROJECT="bgreen"
 
 BACKEND_IMAGE_REPO="${HARBOR_REGISTRY}/${HARBOR_PROJECT}/bgreen-backend"
 FRONTEND_IMAGE_REPO="${HARBOR_REGISTRY}/${HARBOR_PROJECT}/bgreen-frontend"
 
-# Tag images within git commit (better than latest; enables rollback)
+# Tag images with git commit (better than latest; enables rollback)
 VERSION="$(git rev-parse --short HEAD)"
 
 echo "📦 Fetching latest changes from origin/main..."

sge-backend/pom.xml

@@ -11,7 +11,7 @@
     </parent>
     <groupId>com.sgs</groupId>
     <artifactId>sgs</artifactId>
-    <version>0.0.3-SNAPSHOT</version>
+    <version>0.0.2-SNAPSHOT</version>
     <name>sgs</name>
     <description>SGS project for Spring Boot</description>
     <properties>
@@ -130,4 +130,4 @@
         <finalName>sgs-backend</finalName>
     </build>
 
-</project>
+</project>

sge-frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sgs-web",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "private": true,
   "dependencies": {
     "@apollo/client": "^3.13.8",