Merge remote-tracking branch 'origin/master'

PoolC · Mar 29, 2024 · 6f19d7f · 6f19d7f
2 parents 8c2cba2 + 18b7ec2
commit 6f19d7f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -48,16 +48,16 @@ jobs:
         key: ${{ secrets.KEY }}
         port: ${{ secrets.SSH_PORT }}
         source: "./build/libs/*.jar"
-        target: /home/jimmy/dockercompose/palkia
-    - name: restart server
-      uses: appleboy/ssh-action@v1.0.0
-      with:
-        host: ${{ secrets.SERVER_HOST }}
-        username: ${{ secrets.SERVER_USER }}
-        password: ${{ secrets.SSH_PASSWORD }}
-        key: ${{ secrets.KEY }}
-        port: ${{ secrets.SSH_PORT }}
-        script: |
-          cd dockercompose/palkia
-          docker compose down
-          docker compose up -d --build
+        target: /home/ubuntu/palkiabuilds/
+    # - name: restart server
+    #   uses: appleboy/ssh-action@v1.0.0
+    #   with:
+    #     host: ${{ secrets.SERVER_HOST }}
+    #     username: ${{ secrets.SERVER_USER }}
+    #     password: ${{ secrets.SSH_PASSWORD }}
+    #     key: ${{ secrets.KEY }}
+    #     port: ${{ secrets.SSH_PORT }}
+    #     script: |
+    #       cd dockercompose/palkia
+    #       docker compose down
+    #       docker compose up -d --build
diff --git a/README.md b/README.md
@@ -60,6 +60,7 @@ compiler(`⌘,` > `Build, Execution, Deployment` > `Compiler` > `Java Compiler`
 ./gradlew asciidoctor
 ```
 
+
 `/build/asciidoc/html5/api-doc.html` 에서 api 문서를 확인할 수 있습니다.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -60,6 +60,7 @@ compiler(`⌘,` > `Build, Execution, Deployment` > `Compiler` > `Java Compiler`
		./gradlew asciidoctor
		```


		`/build/asciidoc/html5/api-doc.html` 에서 api 문서를 확인할 수 있습니다.


Expand Down