From d53f9d4044870c0c77bdf9013bd141ff9914864a Mon Sep 17 00:00:00 2001 From: Peter Nashaat Date: Sun, 20 Aug 2023 07:33:01 +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 6843431..67c3d30 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_ourparadise/ git log -1 - git restore . - git pull + git fetch + git reset --hard origin/development sed -i "s/https:\/\/ourparadise.ourworld.tf/https:\/\/www2.ourparadise.ourworld.tf/g" config.toml ./build.sh diff --git a/.github/workflows/tf_update_prod.yml b/.github/workflows/tf_update_prod.yml index 08b09f4..a35a5fb 100644 --- a/.github/workflows/tf_update_prod.yml +++ b/.github/workflows/tf_update_prod.yml @@ -18,7 +18,7 @@ jobs: script: | cd websites/www_ourparadise/ git log -1 - git restore . - git pull + git fetch + git reset --hard origin/master sed -i "s/https:\/\/www2.ourparadise.ourworld.tf/https:\/\/ourparadise.ourworld.tf/g" config.toml ./build.sh