From 722e9744d88b92fe720a4654aab1b6b0706c64bd Mon Sep 17 00:00:00 2001
From: Orestis <orestis.malaspinas@pm.me>
Date: Sat, 19 Feb 2022 23:16:37 +0100
Subject: [PATCH] pfffff
---
.gitlab-ci.yml | 8 ++++----
hakyll-bootstrap/Makefile | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8083002..ef319ff 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 1d7318d..6202c37 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
--
GitLab