Merge branch 'main' into main

Imsyp · Sep 23, 2024 · 261c0fe · 261c0fe
2 parents ceb7729 + 3c2acce
commit 261c0fe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/server_cicd.yml b/.github/workflows/server_cicd.yml
@@ -3,7 +3,7 @@ name: server CI/CD Pipeline
 
 on:
   push:
-    paths:
+    paths: 
       - "server/**"
     branches:
       - main
@@ -59,6 +59,3 @@ jobs:
             cd /home/patturning1/deployment  
             sudo docker build -t swdc-app .
             sudo docker run -d -p 8080:8080 --name swdc-container -v /mnt:/mnt swdc-app
-
-      
-
diff --git a/server/settings.gradle b/server/settings.gradle
@@ -1 +1,2 @@
-rootProject.name = 'swdc'
+rootProject.name = 'swdc' 
+
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		rootProject.name = 'swdc'
		rootProject.name = 'swdc'