From c5e199d0073c1cae9d0b1fbec7d1961cce000769 Mon Sep 17 00:00:00 2001 From: Arya Kiran Date: Tue, 13 Sep 2022 16:34:07 +0530 Subject: [PATCH] Reset first, then pull --- .woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker.yml b/.woodpecker.yml index f10e2c2..369f583 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -5,5 +5,5 @@ pipeline: - mkdir -p ~/.ssh - echo "$PRIVKEY $privkey" > ~/.ssh/id_rsa - chmod 700 ~/.ssh && chmod 600 ~/.ssh/id_rsa - - ssh websiteupdate@172.19.0.1 -p1813 -i ~/.ssh/id_rsa "cd /var/www/websitenew && git config pull.rebase true && git pull && git reset --hard origin/master" + - ssh websiteupdate@172.19.0.1 -p1813 -i ~/.ssh/id_rsa "cd /var/www/websitenew && git reset --hard origin/master && git config pull.rebase true && git pull" secrets: [ privkey ]