diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c0b12c8fd34095e24b6747500d044c54718cee6..72a4f3a7f1e7226e0423d93fbb36b99d6268503d 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 277d6bb976ff4c4766b67cd8a686ff67bd31ed2a..fae0b190aeb06fa75e2c3395d391eb6e04adb000 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