From 94811b8caecac5788518cd521d50ae9b044e9bea Mon Sep 17 00:00:00 2001 From: Arya Kiran Date: Tue, 13 Sep 2022 16:30:00 +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 404208a..1cf4b68 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/blog && git config pull.rebase true && git pull && git reset --hard origin/master && make" + - ssh websiteupdate@172.19.0.1 -p1813 -i ~/.ssh/id_rsa "cd /var/www/blog && git reset --hard origin/master && git config pull.rebase true && git pull && make" secrets: [ privkey ]