mam/mamweb
11
0
Fork 0
Code Issues Pull requests 10 Projects Wiki Activity Actions

Hezčí SSH spojení

Browse source 
- Přidal jsem `set -euxo pipefail`, takže nejsou potřeba `&&` a obecně se
  to chová víc jako ostatní make skripty
- Venv se zapíná stejně jako v lokálních skriptech, takže se dá
  jednoduše změnit jeho cesta
This commit is contained in:
Pavel "LEdoian" Turinsky 2022-11-20 04:23:41 +01:00
parent 346079cee3
commit ac9cb53185
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
make/push_compiled_vue_to_test
View file

@ -5,5 +5,10 @@ set -exuo pipefail
scp vue_frontend/webpack-stats.json "$GIMLI_LOGIN:$TESTWEB/vue_frontend/" scp vue_frontend/webpack-stats.json "$GIMLI_LOGIN:$TESTWEB/vue_frontend/"
rsync -ave ssh seminar/static/seminar/vue "$GIMLI_LOGIN:$TESTWEB/seminar/static/seminar/" rsync -ave ssh seminar/static/seminar/vue "$GIMLI_LOGIN:$TESTWEB/seminar/static/seminar/"
# TODO: Je OK tady zapínat venv přímo takhle, nebo by to taky mělo být enkapsulováno do nějakého skriptu (e.g. make/deploy/collect_static)? ssh "$GIMLI_LOGIN" "
ssh "$GIMLI_LOGIN" "cd $TESTWEB && . env/bin/activate && ./manage.py collectstatic --noinput" set -euxo pipefail
cd $TESTWEB
. make/lib.sh
ensure_venv
./manage.py collectstatic --noinput
"

4
make/sync_prod_flatpages
View file

@ -7,8 +7,10 @@ ensure_venv
# TODO: This is very ugly, will fix in a future PR (hopefully) # TODO: This is very ugly, will fix in a future PR (hopefully)
ssh "$GIMLI_LOGIN" " ssh "$GIMLI_LOGIN" "
set -euxo pipefail
cd $PRODWEB cd $PRODWEB
. env/bin/activate . make/lib.sh
ensure_venv
./manage.py dumpdata flatpages --indent=2 > flat.json ./manage.py dumpdata flatpages --indent=2 > flat.json
./fix_json.py flat.json flat_fixed.json ./fix_json.py flat.json flat_fixed.json
" "