diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 80830027d329ac0e13e982dd9428815a2e3aeae9..ef319fffe82da6a0f52bf1e44c820ba7092e7b2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,12 +42,12 @@ build_and_deploy: # - cd ../algo # - git pull origin master # - cd ../../.. - - make update - - make + - make update SHELL=bash + - make SHELL=bash - rsync -avzz css ur1bg_malas@ur1bg.ftp.infomaniak.com:web/malaspinas/ - rsync -avzz figs ur1bg_malas@ur1bg.ftp.infomaniak.com:web/malaspinas/ - rsync -avzz index.html ur1bg_malas@ur1bg.ftp.infomaniak.com:web/malaspinas/ - make build_revealjs -C hakyll-bootstrap - - make build -C hakyll-bootstrap - - make deploy -C hakyll-bootstrap + - make build -C hakyll-bootstrap SHELL=bash + - make deploy -C hakyll-bootstrap SHELL=bash # - blc https://malaspinas.academy -ro --exclude *.pdf --filter-level 3 diff --git a/hakyll-bootstrap/Makefile b/hakyll-bootstrap/Makefile index 1d7318d6cd3f5edd21d2b167e1b9c06f2361cf49..6202c37d5fc976f3085cbaa6fb82a2a8d7eeccc4 100644 --- a/hakyll-bootstrap/Makefile +++ b/hakyll-bootstrap/Makefile @@ -5,13 +5,13 @@ deploy: build stack exec blog -- deploy build: update Main.hs cours/math_tech_info/*.md cours/isc_physics/*.md + make puppeteer -C cours/algo/slides make hakyll_gen -C cours/math_tech_info make hakyll_gen -C cours/isc_physics make -C cours/math_tech_info make -C cours/isc_physics make markdown -C cours/prog_seq/slides # make markdown -C cours/algo/slides - make puppeteer -C cours/algo/slides SHELL=bash make -C cours/algo/slides make index -C cours/algo/slides stack build --allow-different-user && stack exec --allow-different-user blog -- build