From 27207e9c4df7c598566c48712efa0c0faebc733c Mon Sep 17 00:00:00 2001 From: Gyeongho Yang Date: Sat, 21 Sep 2024 16:08:12 +0900 Subject: [PATCH] fix: change specific file to asterisk --- .github/workflows/be-cd.yaml | 13 ++----------- .github/workflows/fe-cd.yaml | 11 +---------- .../ygh/maple/union/controller/UnionController.java | 2 +- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/.github/workflows/be-cd.yaml b/.github/workflows/be-cd.yaml index dad9f27..34585ba 100644 --- a/.github/workflows/be-cd.yaml +++ b/.github/workflows/be-cd.yaml @@ -51,22 +51,13 @@ jobs: echo "JASYPT_PASSWORD=${{ secrets.JASYPT_PASSWORD }}" > .env echo "MYSQL_ROOT_PASSWORD=${{ secrets.MYSQL_ROOT_PASSWORD }}" >> .env - - name: Copy docker compose + - name: Copy jar uses: appleboy/scp-action@v0.1.7 with: host: ${{ secrets.HOST }} username: ${{ secrets.USERNAME }} key: ${{ secrets.KEY }} - source: docker-compose.yaml - target: ~/${{ github.event.repository.name }} - - - name: Copy bootJar - uses: appleboy/scp-action@v0.1.7 - with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - source: backend/build/libs/${{ github.event.repository.name }}.jar + source: docker-compose.yaml, backend/build/libs/ target: ~/${{ github.event.repository.name }} - name: Restart docker compose diff --git a/.github/workflows/fe-cd.yaml b/.github/workflows/fe-cd.yaml index 8b57ff0..89e01ea 100644 --- a/.github/workflows/fe-cd.yaml +++ b/.github/workflows/fe-cd.yaml @@ -31,22 +31,13 @@ jobs: working-directory: frontend run: npm run build - - name: Copy docker compose - uses: appleboy/scp-action@v0.1.7 - with: - host: ${{ secrets.HOST }} - username: ${{ secrets.USERNAME }} - key: ${{ secrets.KEY }} - source: docker-compose.yaml - target: ~/${{ github.event.repository.name }} - - name: Copy dist uses: appleboy/scp-action@v0.1.7 with: host: ${{ secrets.HOST }} username: ${{ secrets.USERNAME }} key: ${{ secrets.KEY }} - source: frontend/dist/ + source: docker-compose.yaml, frontend/dist/ target: ~/${{ github.event.repository.name }} # - name: Restart docker compose diff --git a/backend/src/main/java/kr/ygh/maple/union/controller/UnionController.java b/backend/src/main/java/kr/ygh/maple/union/controller/UnionController.java index 742ace7..2dbc5b5 100644 --- a/backend/src/main/java/kr/ygh/maple/union/controller/UnionController.java +++ b/backend/src/main/java/kr/ygh/maple/union/controller/UnionController.java @@ -24,6 +24,6 @@ public Basic basic(@ModelAttribute @Valid NameRequest nameRequest) { @GetMapping("test") public String test() { - return "tetete"; + return "tetetete"; } }