Merge pull request #9 from ourworldventures/development

merge dev to master
This commit is contained in:
PeterNashaat
2023-08-21 14:18:19 +03:00
committed by GitHub
113 changed files with 1073 additions and 592 deletions

View File

@@ -22,4 +22,5 @@ jobs:
git log -1
git fetch
git reset --hard origin/development
sed -i "s/https:\/\/jungleparadise.tf/https:\/\/www2.jungleparadise.tf/g" config.toml
bash build.sh

26
.github/workflows/tf_update_dev_new.yml vendored Normal file
View File

@@ -0,0 +1,26 @@
name: Jungleparadise Staging
on:
push:
branches:
- development_new
jobs:
job_one:
name: Deploy
runs-on: ubuntu-latest
steps:
- name: pushing latest change on www3.jungleparadise.tf
uses: appleboy/ssh-action@master
with:
host: www3.jungleparadise.tf
username: ${{ secrets.TF_USER }}
key: ${{ secrets.TF_SECRET }}
port: ${{ secrets.TF_PORT }}
script: |
cd websites/www3/www_jungle_paradise/
git log -1
git fetch
git reset --hard origin/development_new
sed -i "s/https:\/\/www2.jungleparadise.tf/https:\/\/www3.jungleparadise.tf/g" config.toml
bash build.sh

View File

@@ -22,4 +22,5 @@ jobs:
git log -1
git fetch
git reset --hard origin/master
sed -i "s/https:\/\/www2.jungleparadise.tf/https:\/\/jungleparadise.tf/g" config.toml
bash build.sh