Skip to content

Commit 807a809

Browse files
committed
Add git reset and clean before pull to avoid untracked file conflicts
1 parent 4d99a45 commit 807a809

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

.github/workflows/deploy-beta.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ jobs:
1717
port: ${{ secrets.SSH_PORT || 22 }}
1818
script: |
1919
cd ${{ secrets.BETA_PATH }}
20+
git reset --hard HEAD
21+
git clean -fd
2022
git pull origin beta

.github/workflows/deploy-main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,6 @@ jobs:
1717
port: ${{ secrets.SSH_PORT || 22 }}
1818
script: |
1919
cd ${{ secrets.MAIN_PATH }}
20+
git reset --hard HEAD
21+
git clean -fd
2022
git pull origin main

0 commit comments

Comments
 (0)