Merge branch 'development' of https://github.com/threefoldfoundation/www_threefold_io into development

This commit is contained in:
2023-10-26 16:22:13 +03:00
2 changed files with 4 additions and 4 deletions

View File

@@ -18,8 +18,8 @@ jobs:
script: | script: |
cd /opt/www_threefold_io/ cd /opt/www_threefold_io/
git log -1 git log -1
git restore . git fetch
git pull 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:\/\/www2.threefold.io/g" config.toml
./build.sh ./build.sh

View File

@@ -18,8 +18,8 @@ jobs:
script: | script: |
cd /opt/www_threefold_io/ cd /opt/www_threefold_io/
git log -1 git log -1
git restore . git fetch
git pull git reset --hard origin/master
sed -i "s/https:\/\/www2.threefold.io/https:\/\/www.threefold.io/g" config.toml sed -i "s/https:\/\/www2.threefold.io/https:\/\/www.threefold.io/g" config.toml
./build.sh ./build.sh