From ba16edf2e09bc610dfbaed3056118d619716346e Mon Sep 17 00:00:00 2001 From: petep Date: Wed, 19 Jul 2023 09:52:37 +0000 Subject: [PATCH] adding auto dep --- .github/workflows/tf_update_dev.yml | 14 +++++++------- .github/workflows/tf_update_prod.yml | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/tf_update_dev.yml b/.github/workflows/tf_update_dev.yml index 40cc047..a5aafd8 100644 --- a/.github/workflows/tf_update_dev.yml +++ b/.github/workflows/tf_update_dev.yml @@ -1,4 +1,4 @@ -name: www2.ourphone.tf +name: www2.ourzone.ourworld.tf on: push: branches: [ development ] @@ -8,17 +8,17 @@ jobs: name: Deploy runs-on: ubuntu-latest steps: - - name: pushing latest change on www2.ourphone.tf + - name: pushing latest change on www2.ourzone.ourworld.tf uses: appleboy/ssh-action@master with: - host: www2.ourphone.tf + host: www2.ourzone.ourworld.tf username: webuser key: ${{ secrets.TF_SECRET }} port: 34022 script: | - cd websites/www2/www_ourphone/ + cd websites/www2/www_ourzone/ git log -1 - git restore . - git pull - sed -i "s/https:\/\/ourphone.tf/https:\/\/www2.ourphone.tf/g" config.toml + git fetch + git reset --hard origin/development + sed -i "s/https:\/\/ourzone.ourworld.tf/https:\/\/www2.ourzone.ourworld.tf/g" config.toml ./build.sh diff --git a/.github/workflows/tf_update_prod.yml b/.github/workflows/tf_update_prod.yml index 0378d5b..37c29ab 100644 --- a/.github/workflows/tf_update_prod.yml +++ b/.github/workflows/tf_update_prod.yml @@ -1,4 +1,4 @@ -name: ourphone.tf +name: ourzone.ourworld.tf on: push: branches: [ master ] @@ -8,17 +8,17 @@ jobs: name: Deploy runs-on: ubuntu-latest steps: - - name: pushing latest change on ourphone.tf + - name: pushing latest change on ourzone.ourworld.tf uses: appleboy/ssh-action@master with: - host: ourphone.tf + host: ourzone.ourworld.tf username: webuser key: ${{ secrets.TF_SECRET }} port: 34022 script: | - cd websites/www_ourphone/ + cd websites/www_ourzone/ git log -1 - git restore . - git pull - sed -i "s/https:\/\/ourphone.tf/https:\/\/ourphone.tf/g" config.toml + git fetch + git reset --hard origin/master + sed -i "s/https:\/\/www2.ourzone.ourworld.tf/https:\/\/ourzone.ourworld.tf/g" config.toml ./build.sh