[feat] 가형, 나형 과목을 추가해요 #150
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| name: moplus-server | |
| on: | |
| push: | |
| branches: | |
| - develop | |
| jobs: | |
| deploy: | |
| runs-on: ubuntu-latest | |
| steps: | |
| - name: Deploy spring MainServer(develop) | |
| uses: appleboy/ssh-action@master | |
| with: | |
| host: ${{ secrets.SERVER_HOST }} | |
| username: ${{ secrets.SERVER_USERNAME }} | |
| key: ${{ secrets.SERVER_KEY }} | |
| script: | | |
| cd ~/moplus_server | |
| git checkout develop | |
| kill -9 $(lsof -t -i :8081) | |
| git add ../ | |
| git commit -m "temp commit" | |
| git fetch origin develop | |
| git merge origin/develop | |
| if [ $? -ne 0 ]; then | |
| echo "Merge conflict detected. Resolving by applying remote changes." | |
| git checkout --theirs $(git diff --name-only --diff-filter=U) | |
| git add . | |
| git commit -m "Resolved merge conflicts by applying remote changes." | |
| else | |
| echo "Merge successful, no conflicts detected." | |
| fi | |
| ./gradlew clean build | |
| docker rm -f pointer-server-dev --force | |
| docker rmi pointer-server-dev | |
| docker-compose -f docker-compose-dev.yml -p pointer-dev up --build -d |