From cfdde742ff4e3150f8cf89cb94062aab8228d746 Mon Sep 17 00:00:00 2001 From: peternashaat Date: Thu, 26 Oct 2023 13:15:27 +0000 Subject: [PATCH] new logic for reseting local repo --- .github/workflows/tf_update_dev.yml | 4 ++-- .github/workflows/tf_update_prod.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tf_update_dev.yml b/.github/workflows/tf_update_dev.yml index 6509a4952..786d85c30 100644 --- a/.github/workflows/tf_update_dev.yml +++ b/.github/workflows/tf_update_dev.yml @@ -18,8 +18,8 @@ jobs: script: | cd /opt/www_threefold_io/ git log -1 - git restore . - git pull + git fetch + git reset --hard origin/development sed -i "s/https:\/\/www.threefold.io/https:\/\/www2.threefold.io/g" config.toml ./build.sh diff --git a/.github/workflows/tf_update_prod.yml b/.github/workflows/tf_update_prod.yml index 7210bd6e0..c327d2e22 100644 --- a/.github/workflows/tf_update_prod.yml +++ b/.github/workflows/tf_update_prod.yml @@ -18,8 +18,8 @@ jobs: script: | cd /opt/www_threefold_io/ git log -1 - git restore . - git pull + git fetch + git reset --hard origin/master sed -i "s/https:\/\/www2.threefold.io/https:\/\/www.threefold.io/g" config.toml ./build.sh