From b0d831fe1a2cccc81b2b37e5d7b1c87bbab09c34 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Thu, 12 Apr 2018 16:38:04 +0000 Subject: [PATCH] add ci and some fixes --- .drone.yml | 54 ++++++++++++++++++++++++++++++++++++ .gitmodules | 4 +-- Makefile | 5 +++- compile.sh | 63 +++++++++++++++++++----------------------- latex/mtheme => mtheme | 0 5 files changed, 88 insertions(+), 38 deletions(-) create mode 100644 .drone.yml rename latex/mtheme => mtheme (100%) diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..f594e4d --- /dev/null +++ b/.drone.yml @@ -0,0 +1,54 @@ +pipeline: + build-latex: + image: jess/texlive + commands: + - apt-get update + - apt-get install -y --no-install-recommends wget rubber make inkscape + - ./compile.sh latex + + build-libreoffice: + image: jess/libreoffice + commands: + - wget -P /usr/share/fonts -c -q + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraMono-Bold.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraMono-Medium.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraMono-Regular.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-Bold.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-BoldItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-Book.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-BookItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-Eight.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-EightItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-ExtraBold.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-ExtraBoldItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-ExtraLight.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-ExtraLightItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-Four.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-FourItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-Hair.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-HairItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-Heavy.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-HeavyItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-Light.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-Italic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-LightItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-Medium.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-MediumItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-Regular.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-SemiBold.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-SemiBoldItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-Thin.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-ThinItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-Two.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-TwoItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-Ultra.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-UltraItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-UltraLightItalic.ttf + https://cdn.jsdelivr.net/npm/mozilla-fira-pack/Fira/ttf/FiraSans-UltraLight.ttf + - ./compile.sh libreoffice + + build-revealjs: + image: node:alpine + commands: + - apk add --no-cache make + - ./compile.sh revealjs diff --git a/.gitmodules b/.gitmodules index 1ecbfd1..a2d1a9f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ -[submodule "latex/mtheme"] - path = latex/mtheme +[submodule "mtheme"] + path = mtheme url = https://github.com/matze/mtheme [submodule "revealjs/amnesty/amnesty-dp-2016"] path = revealjs/amnesty/amnesty-dp-2016 diff --git a/Makefile b/Makefile index 941ab13..b1f8f62 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,6 @@ +.PHONY: default +default: + .PHONY: clean clean: find latex \ @@ -12,7 +15,7 @@ clean: -o -iname "*.eps" \ \) \ -delete - find . -iname "*.pdf" -type f -delete + find latex revealjs -iname "*.pdf" -type f -delete rm -rf latex/fonts revealjs/node_modules latex/fonts: diff --git a/compile.sh b/compile.sh index a4d5af6..ff37c06 100755 --- a/compile.sh +++ b/compile.sh @@ -1,39 +1,32 @@ -#!/bin/bash -set -e -set -x +#!/bin/sh +case "$1" in + "latex") + make fonts -## -# Build LaTeX documents -## + for presi in latex/*;do + for file in $presi/*.svg;do + [ -e "$file" ] && make "${file%.svg}".eps + done -make fonts + [ -e "$presi/index.tex" ] && make "$presi/index.pdf" + done -for presi in latex/*;do -# [ "$presi" == "latex/mtheme" ] && break -# [ "$presi" == "latex/fonts" ] && break + true + ;; + "libreoffice") + for presi in latex/* revealjs/*;do + [ -e "$presi/handout.odt" ] && make "$presi/handout.pdf" + done + ;; + "revealjs") + make revealjs/node_modules - for file in $presi/*.svg;do - [ -e "$file" ] && make "${file%.svg}".eps - done - - [ -e "$presi/index.tex" ] && make "$presi/index.pdf" - [ -e "$presi/handout.odt" ] && make "$presi/handout.pdf" -done - -## -# install nodejs modules -## - -make revealjs/node_modules - -## -# Build PDF for revealjs -## - -for presi in revealjs/*;do -# [ "$presi" == "revealjs/node_modules" ] && break - - [ -e "$presi/index.html" ] && make "$presi/index.pdf" - - [ -e $presi/handout.odt ] && make "$presi/handout.pdf" -done + for presi in revealjs/*;do + [ -e "$presi/index.html" ] && make "$presi/index.pdf" + done + ;; + *) + echo "USAGE: $0 [MODE]" + echo "modes: latex libreoffice revealjs" + ;; +esac diff --git a/latex/mtheme b/mtheme similarity index 100% rename from latex/mtheme rename to mtheme