From 97eb004895375d7309f5756f6b3082121ffd0fa7 Mon Sep 17 00:00:00 2001 From: Peter Nashaat Date: Sun, 20 Aug 2023 07:39:22 +0000 Subject: [PATCH] actions new 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 51c32ec..d5be1a7 100644 --- a/.github/workflows/tf_update_dev.yml +++ b/.github/workflows/tf_update_dev.yml @@ -18,7 +18,7 @@ jobs: script: | cd websites/www2/www_ournomads/ git log -1 - git restore . - git pull + git fetch + git reset --hard origin/development sed -i "s/https:\/\/ournomads.ourworld.tf/https:\/\/www2.ournomads.ourworld.tf/g" config.toml ./build.sh diff --git a/.github/workflows/tf_update_prod.yml b/.github/workflows/tf_update_prod.yml index ba2564f..e2bd837 100644 --- a/.github/workflows/tf_update_prod.yml +++ b/.github/workflows/tf_update_prod.yml @@ -18,7 +18,7 @@ jobs: script: | cd websites/www_ournomads/ git log -1 - git restore . - git pull + git fetch + git reset --hard origin/master sed -i "s/https:\/\/www2.ournomads.ourworld.tf/https:\/\/ournomads.ourworld.tf/g" config.toml ./build.sh