Skip to content

Commit

Permalink
fix: 구현 완료 버전 dev 브랜치를 master에 적용
Browse files Browse the repository at this point in the history
  • Loading branch information
pandahwang committed Oct 15, 2024
1 parent e25c979 commit e5663aa
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Deploy To EC2
on:
push:
branches:
- dev
- master

jobs:
Deploy:
Expand All @@ -22,7 +22,7 @@ jobs:
script: |
cd /home/ubuntu/LostArk
rm -rf src/main/resources/application.properties
git pull origin dev
git pull origin master
echo "$APPLICATION_PROPERTIES" > src/main/resources/application.properties
./gradlew clean build
docker compose -f compose-prod.yml down
Expand Down

0 comments on commit e5663aa

Please sign in to comment.