diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b169d50fbdf6856be54bb176b8483a9caf410dd..80830027d329ac0e13e982dd9428815a2e3aeae9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,15 +33,16 @@ before_script: build_and_deploy: script: - pandoc -v - - cd hakyll-bootstrap/cours/prog_seq - - git pull origin master - - cd ../math_tech_info - - git pull origin master - - cd ../isc_physics - - git pull origin master - - cd ../algo - - git pull origin master - - cd ../../.. + # - cd hakyll-bootstrap/cours/prog_seq + # - git pull origin master + # - cd ../math_tech_info + # - git pull origin master + # - cd ../isc_physics + # - git pull origin master + # - cd ../algo + # - git pull origin master + # - cd ../../.. + - make update - make - rsync -avzz css ur1bg_malas@ur1bg.ftp.infomaniak.com:web/malaspinas/ - rsync -avzz figs ur1bg_malas@ur1bg.ftp.infomaniak.com:web/malaspinas/ diff --git a/Makefile b/Makefile index 392b9edd232a1944e49dcd725176bff7c9995195..8fb04e1c1417369cae4bb0c476706f6f244278a8 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ deploy: all cp -r css site/ update: - git submodule foreach git pull origin master + git submodule foreach 'git pull origin master || true' clean: rm -rf index.html