rebasing continues [wip]

This commit is contained in:
surtur 2020-02-28 00:17:25 +01:00
parent c660462b26
commit 48d576ef97
Signed by: wanderer
GPG Key ID: 19CE1EC1D9E0486D

@ -65,6 +65,7 @@ steps:
OL_D: OL_D:
from_secret: hugo_dir from_secret: hugo_dir
commands: commands:
<<<<<<< HEAD
- echo $OL_P > nupass - echo $OL_P > nupass
- export RSYNC_RSH='sshpass -f ./nupass ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null' - export RSYNC_RSH='sshpass -f ./nupass ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null'
- rsync -av --delete --chown $OL public/ $OL@dotya.ml:$OL_D-test - rsync -av --delete --chown $OL public/ $OL@dotya.ml:$OL_D-test
@ -113,3 +114,11 @@ steps:
from_secret: discord_webhook_id from_secret: discord_webhook_id
webhook_token: webhook_token:
from_secret: discord_webhook_token from_secret: discord_webhook_token
=======
- pacman -Syu --noconfirm wget tar
- wget https://github.com/gohugoio/hugo/releases/download/v0.65.3/hugo_extended_0.65.3_Linux-64bit.tar.gz -O hugo.tgz
- tar xfv hugo.tgz
- git submodule init
- git submodule update
- ./hugo --gc=true
>>>>>>> 75ffadc... [skip ci] add submodule in hugo-extended build too