Merge pull request #11 from aldras/main

Chore: Update deployment file, add git reset
owddm · Apr 8, 2023 · 031bfb4 · 031bfb4
2 parents e4e5b89 + 339857d
commit 031bfb4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -18,7 +18,7 @@ jobs:
         echo "${{ secrets.DEPLOY_SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
         ssh-keyscan -H ${{ secrets.DEPLOY_SSH_HOST }} > ~/.ssh/known_hosts
     - name: connect and pull
-      run: ssh ${{ secrets.DEPLOY_SSH_USER }}@${{ secrets.DEPLOY_SSH_HOST }} "cd ${{ secrets.DEPLOY_WORK_DIR }} && git checkout ${{ secrets.DEPLOY_MAIN_BRANCH }} && git pull && exit"
+      run: ssh ${{ secrets.DEPLOY_SSH_USER }}@${{ secrets.DEPLOY_SSH_HOST }} "cd ${{ secrets.DEPLOY_WORK_DIR }} && git reset --hard && git checkout ${{ secrets.DEPLOY_MAIN_BRANCH }} && git pull && exit"
     - name: execute post tasks
       run: ssh ${{ secrets.DEPLOY_SSH_USER }}@${{ secrets.DEPLOY_SSH_HOST }} "cd ${{ secrets.DEPLOY_WORK_DIR }} && cd ../. && ./deploy_post.sh && exit"
     - name: cleanup