Remove automatic conflict resolution step from deploy workflow #62
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
| # This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node | |
| # For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions | |
| name: deploy | |
| on: | |
| push: | |
| branches: [ main ] | |
| jobs: | |
| deploy: | |
| runs-on: ubuntu-latest | |
| strategy: | |
| matrix: | |
| node-version: [15.x] | |
| steps: | |
| - name: SSH Deploy | |
| uses: garygrossgarten/github-action-ssh@release | |
| with: | |
| command: cd ${{ secrets.FOLDER }} && git pull origin main | |
| host: ${{ secrets.HOST }} | |
| username: ${{ secrets.USER_NAME }} | |
| privateKey: ${{ secrets.PRIVATE_KEY}} | |