From a04ab4d919500bfe9a7b9afcf41b2eeee0dc86db Mon Sep 17 00:00:00 2001
From: Orestis <orestis.malaspinas@hesge.ch>
Date: Wed, 11 Nov 2020 23:00:39 +0100
Subject: [PATCH] updated makefile and ci
---
.gitlab-ci.yml | 2 ++
slides/Makefile | 9 +++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c0b12c..72a4f3a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,12 +42,14 @@ before_script:
build_only:
script:
+ - cd slides
- make
- make deploy
- rsync -avz prog_seq_c_cours ur1bg_malas@ur1bg.ftp.infomaniak.com:web/malaspinas/
build_artifacts:
script:
+ - cd slides
- make
artifacts:
paths:
diff --git a/slides/Makefile b/slides/Makefile
index 277d6bb..fae0b19 100644
--- a/slides/Makefile
+++ b/slides/Makefile
@@ -16,7 +16,9 @@ HTML=$(MD:%.md=%.html)
PDF=$(MD:%.md=%.pdf)
MARKDOWN=$(MD:%.md=%.markdown)
-all: $(MARKDOWN)
+all: $(PDF) $(HTML)
+
+markdown: $(MARKDOWN)
%.pdf: %.md metadata.yaml
pandoc -s $(OPTIONS) $(PDFOPTIONS) -o $@ $^
@@ -26,7 +28,10 @@ all: $(MARKDOWN)
%.markdown: %.md metadata.yaml
echo "---" >> $@
- sed '1 { /^---/ { :a N; /\n---/! ba; d} }' $< > only_header && grep -v -F -x -f only_header $< > header.yaml && ./yq_linux_amd64 merge metadata.yaml header.yaml > $@
+ sed '1 { /^---/ { :a N; /\n---/! ba; d} }' $< > only_header
+ grep -v -F -x -f only_header $< > header.yaml
+ ./yq_linux_amd64 merge metadata.yaml header.yaml > $@
+ rm only_header header.yaml
--
GitLab