From a4fac57f3684789e84d7959fd3fc77e0ff1e062d Mon Sep 17 00:00:00 2001 From: Zepelown Date: Fri, 20 Dec 2024 22:35:26 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20Deploy.yml=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=9E=91=EC=97=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/build.yml | 5 ++++- .github/workflows/deploy.yml | 11 ----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 96f75fc..eed408c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,6 +1,9 @@ name: Build on: + push: + branches: + - Fix/#58 pull_request: branches: - develop @@ -9,7 +12,7 @@ on: jobs: build: - if: github.event.pull_request.merged == true + # if: github.event.pull_request.merged == true runs-on: ubuntu-latest steps: diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 259b3ae..638b3a5 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -11,17 +11,6 @@ jobs: runs-on: ubuntu-latest steps: - - name: Set environment values - run: | - touch ./wabi/src/main/resources/env.properties - echo "SPRING_DATASOURCE_URL=${{ secrets.SPRING_DATASOURCE_URL }}" >> ./env.properties - echo "SPRING_DATASOURCE_USERNAME=${{ secrets.SPRING_DATASOURCE_USERNAME }}" >> ./env.properties - echo "SPRING_DATASOURCE_PASSWORD=${{ secrets.SPRING_DATASOURCE_PASSWORD }}" >> ./env.properties - echo "JWT_KEY=${{ secrets.JWT_KEY }}" >> ./env.properties - echo "JWT_EXPIRATION_MINUTES=${{ secrets.JWT_EXPIRATION_MINUTES }}" >> ./env.properties - echo "JWT_REFRESH_EXPIRATION_HOURS=${{ secrets.JWT_REFRESH_EXPIRATION_HOURS }}" >> ./env.properties - echo "JWT_ISSUER=${{ secrets.JWT_ISSUER }}" >> ./env.properties - - name: Deploy using Docker uses: appleboy/ssh-action@master with: