Merge branch 'development' of https://github.com/threefoldfoundation/www_threefold_io into development
This commit is contained in:
4
.github/workflows/tf_update_dev.yml
vendored
4
.github/workflows/tf_update_dev.yml
vendored
@@ -11,7 +11,7 @@ jobs:
|
|||||||
- name: pushing latest change on www2.threefold.io
|
- name: pushing latest change on www2.threefold.io
|
||||||
uses: appleboy/ssh-action@master
|
uses: appleboy/ssh-action@master
|
||||||
with:
|
with:
|
||||||
host: www2.threefold.io
|
host: dev.threefold.io
|
||||||
username: webuser
|
username: webuser
|
||||||
key: ${{ secrets.TF_SECRET }}
|
key: ${{ secrets.TF_SECRET }}
|
||||||
port: 34022
|
port: 34022
|
||||||
@@ -20,5 +20,5 @@ jobs:
|
|||||||
git log -1
|
git log -1
|
||||||
git fetch
|
git fetch
|
||||||
git reset --hard origin/development
|
git reset --hard origin/development
|
||||||
sed -i "s/https:\/\/www.threefold.io/https:\/\/www2.threefold.io/g" config.toml
|
sed -i "s/https:\/\/www.threefold.io/https:\/\/dev.threefold.io/g" config.toml
|
||||||
./build.sh
|
./build.sh
|
||||||
|
|||||||
2
.github/workflows/tf_update_prod.yml
vendored
2
.github/workflows/tf_update_prod.yml
vendored
@@ -20,5 +20,5 @@ jobs:
|
|||||||
git log -1
|
git log -1
|
||||||
git fetch
|
git fetch
|
||||||
git reset --hard origin/master
|
git reset --hard origin/master
|
||||||
sed -i "s/https:\/\/www2.threefold.io/https:\/\/www.threefold.io/g" config.toml
|
sed -i "s/https:\/\/dev.threefold.io/https:\/\/www.threefold.io/g" config.toml
|
||||||
./build.sh
|
./build.sh
|
||||||
|
|||||||
Reference in New Issue
Block a user