From 56d3eb33171b135e8d95573a93bea290d0bf2ebc Mon Sep 17 00:00:00 2001
From: Orestis Malaspinas <orestis.malaspinas@hesge.ch>
Date: Thu, 14 Jun 2018 12:24:37 +0200
Subject: [PATCH] different updates
---
.gitlab-ci.yml | 8 +++++---
Makefile | 5 ++++-
variables.md | 10 +++++-----
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e8d97c..ac01a89 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,10 +2,12 @@ image: omalaspinas/archlinux-pandoc:thirdtry
build:
script:
- - cd figs
- - ./convert.sh
- - cd ..
- make
artifacts:
paths:
- "*.html"
+ - "reveal.js/lib/js/classList.js"
+ - "reveal.js/plugin/zoom-js/zoom.js"
+ - "reveal.js/plugin/highlight/highlight.js"
+ - "js/remote-diagrams.js"
+ - "reveal.js/plugin/notes/notes.js"
diff --git a/Makefile b/Makefile
index f565f3d..c69428d 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,10 @@ REVEALOPRIONS += --self-contained
# all: cours.pdf cours.html
-all: intro.html variables.html
+all: figs/convert.sh intro.html variables.html
+
+figs/convert.sh: $(wildcard *.svg)
+ cd figs; ./convert.sh
# cours.pdf: cours.md Makefile
# pandoc -s $(BEAMEROPTIONS) -o $@ $<
diff --git a/variables.md b/variables.md
index eac9505..cd466f4 100644
--- a/variables.md
+++ b/variables.md
@@ -9,11 +9,11 @@ header-includes:
<link rel="stylesheet" href="reveal.js/css/theme/simple.css" id="theme">
<link rel="stylesheet" href="css/console.css" id="theme">
<script src="jquery/dist/jquery.min.js"></script>
- <script src="reveal.js/lib/js/classList.js"></script>
- <script src="reveal.js/plugin/zoom-js/zoom.js"></script>
- <script src="reveal.js/plugin/highlight/highlight.js"></script>
- <script src="js/remote-diagrams.js"></script>
- <script src="reveal.js/plugin/notes/notes.js"></script>
+ <!-- <script src="reveal.js/lib/js/classList.js"></script> -->
+ <!-- <script src="reveal.js/plugin/zoom-js/zoom.js"></script> -->
+ <!-- <script src="reveal.js/plugin/highlight/highlight.js"></script> -->
+ <!-- <script src="js/remote-diagrams.js"></script> -->
+ <!-- <script src="reveal.js/plugin/notes/notes.js"></script> -->
include-after:
<script src="js/playRust.js"></script>
<script src="js/remote-code.js"></script>
--
GitLab