From 577f06943608b4cfcc003a9835c07c11dbf6beb4 Mon Sep 17 00:00:00 2001 From: ddrayko Date: Sat, 20 Jun 2026 11:33:09 +0200 Subject: [PATCH 1/6] Fix git pull with explicit remote branch --- .github/workflows/deploy-beta.yml | 2 +- .github/workflows/deploy-main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml index f0d4c2d..fb37c07 100644 --- a/.github/workflows/deploy-beta.yml +++ b/.github/workflows/deploy-beta.yml @@ -17,4 +17,4 @@ jobs: port: ${{ secrets.SSH_PORT || 22 }} script: | cd ${{ secrets.BETA_PATH }} - git pull + git pull origin beta diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index 58b8da7..40accb2 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -17,4 +17,4 @@ jobs: port: ${{ secrets.SSH_PORT || 22 }} script: | cd ${{ secrets.MAIN_PATH }} - git pull + git pull origin main From 807a809971f4d6f928aad679a9b803c0bbb73eb2 Mon Sep 17 00:00:00 2001 From: ddrayko Date: Sat, 20 Jun 2026 11:33:43 +0200 Subject: [PATCH 2/6] Add git reset and clean before pull to avoid untracked file conflicts --- .github/workflows/deploy-beta.yml | 2 ++ .github/workflows/deploy-main.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml index fb37c07..e9ca752 100644 --- a/.github/workflows/deploy-beta.yml +++ b/.github/workflows/deploy-beta.yml @@ -17,4 +17,6 @@ jobs: port: ${{ secrets.SSH_PORT || 22 }} script: | cd ${{ secrets.BETA_PATH }} + git reset --hard HEAD + git clean -fd git pull origin beta diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index 40accb2..8e6a885 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -17,4 +17,6 @@ jobs: port: ${{ secrets.SSH_PORT || 22 }} script: | cd ${{ secrets.MAIN_PATH }} + git reset --hard HEAD + git clean -fd git pull origin main From c000ac89beebe0436f4e1cc7110f60969e3c1954 Mon Sep 17 00:00:00 2001 From: ddrayko Date: Sat, 20 Jun 2026 11:34:22 +0200 Subject: [PATCH 3/6] Use git stash instead of clean to preserve .env --- .github/workflows/deploy-beta.yml | 4 ++-- .github/workflows/deploy-main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml index e9ca752..9a6fbd8 100644 --- a/.github/workflows/deploy-beta.yml +++ b/.github/workflows/deploy-beta.yml @@ -17,6 +17,6 @@ jobs: port: ${{ secrets.SSH_PORT || 22 }} script: | cd ${{ secrets.BETA_PATH }} - git reset --hard HEAD - git clean -fd + git add -A + git stash git pull origin beta diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index 8e6a885..6b0de8c 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -17,6 +17,6 @@ jobs: port: ${{ secrets.SSH_PORT || 22 }} script: | cd ${{ secrets.MAIN_PATH }} - git reset --hard HEAD - git clean -fd + git add -A + git stash git pull origin main From 339f1d023a1953f34d696759aa2748e7b6f04584 Mon Sep 17 00:00:00 2001 From: ddrayko Date: Sat, 20 Jun 2026 11:36:35 +0200 Subject: [PATCH 4/6] Add pm2 restart after git pull --- .github/workflows/deploy-beta.yml | 2 ++ .github/workflows/deploy-main.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml index 9a6fbd8..f1fb1bb 100644 --- a/.github/workflows/deploy-beta.yml +++ b/.github/workflows/deploy-beta.yml @@ -20,3 +20,5 @@ jobs: git add -A git stash git pull origin beta + pm2 stop beta + pm2 start beta diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index 6b0de8c..6c7ab23 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -20,3 +20,5 @@ jobs: git add -A git stash git pull origin main + pm2 stop zerohost-dashboard + pm2 start zerohost-dashboard From 12a08e44da903343e92eb65ef1a4e86e0681a723 Mon Sep 17 00:00:00 2001 From: ddrayko Date: Sat, 20 Jun 2026 11:37:43 +0200 Subject: [PATCH 5/6] Add npm install after git pull in deploy workflows --- .github/workflows/deploy-beta.yml | 1 + .github/workflows/deploy-main.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml index f1fb1bb..da61973 100644 --- a/.github/workflows/deploy-beta.yml +++ b/.github/workflows/deploy-beta.yml @@ -20,5 +20,6 @@ jobs: git add -A git stash git pull origin beta + npm install pm2 stop beta pm2 start beta diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index 6c7ab23..5816bfc 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -20,5 +20,6 @@ jobs: git add -A git stash git pull origin main + npm install pm2 stop zerohost-dashboard pm2 start zerohost-dashboard From fbdfe32d2a1dd1e2aa109aa92b489a1d91801802 Mon Sep 17 00:00:00 2001 From: ddrayko Date: Sat, 20 Jun 2026 11:43:50 +0200 Subject: [PATCH 6/6] Use git fetch + checkout -B for robust deploy --- .github/workflows/deploy-beta.yml | 8 +++----- .github/workflows/deploy-main.yml | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy-beta.yml b/.github/workflows/deploy-beta.yml index da61973..e681b74 100644 --- a/.github/workflows/deploy-beta.yml +++ b/.github/workflows/deploy-beta.yml @@ -17,9 +17,7 @@ jobs: port: ${{ secrets.SSH_PORT || 22 }} script: | cd ${{ secrets.BETA_PATH }} - git add -A - git stash - git pull origin beta + git fetch origin + git checkout -B beta origin/beta npm install - pm2 stop beta - pm2 start beta + pm2 restart beta diff --git a/.github/workflows/deploy-main.yml b/.github/workflows/deploy-main.yml index 5816bfc..f7102e4 100644 --- a/.github/workflows/deploy-main.yml +++ b/.github/workflows/deploy-main.yml @@ -17,9 +17,7 @@ jobs: port: ${{ secrets.SSH_PORT || 22 }} script: | cd ${{ secrets.MAIN_PATH }} - git add -A - git stash - git pull origin main + git fetch origin + git checkout -B main origin/main npm install - pm2 stop zerohost-dashboard - pm2 start zerohost-dashboard + pm2 restart zerohost-dashboard