finer granulated pipeline

.gitignore

@@ -6,3 +6,4 @@
 *.aux
 *.fdb_latexmk
 *.out/
+example/example.tar.gz

.gitlab-ci.yml

@@ -12,33 +12,68 @@ default:
   tags:
     - shared
 
+grafiken:
+  stage: build
+  script:
+    - make grafiken
+  artifacts:
+    paths:
+      - grafiken/*.pdf
+
 mindmap:
   stage: build
   script:
     - make mindmap/MindMap.pdf
-    - make mindmap/MindMap.gif
     - make mindmap/ProjectGraph.pdf
-    - make mindmap/ProjectGraph.gif
   artifacts:
     paths:
       - mindmap/MindMap.pdf
-      - mindmap/MindMap.gif
       - mindmap/ProjectGraph.pdf
-      - mindmap/ProjectGraph.gif
 
 presentation:
   stage: build
   script:
     - make presentation/presentation.pdf
+  needs:
+    - job: grafiken
+      artifacts: true
   artifacts:
     paths:
       - presentation/presentation.pdf
 
-example:
-  image: alpine
+package-example:
   stage: build
+  image: alpine
   script:
-    - apk add --no-cache git zsh
-    - mkdir /alice /bob /github
-    - mv example/workdir /
-    - ./example/example.sh
+    - make example/example.tar.gz
+  artifacts:
+    paths:
+      - example/example.tar.gz
+  before_script:
+    - apk --no-cache add make tar gzip
+
+run-example:
+  stage: test
+  image: docker
+  needs:
+    - job: package-example
+      artifacts: true
+  script:
+    - tar -C /tmp -xf example/example.tar.gz
+    - cd /tmp/example
+    - DFLAGS=\  make
+  before_script:
+    - apk --no-cache add make tar gzip
+
+preview:
+  stage: deploy
+  script:
+    - make mindmap/ProjectGraph.gif
+    - make mindmap/MindMap.gif
+  needs:
+    - job: mindmap
+      artifacts: true
+  artifacts:
+    paths:
+      - mindmap/MindMap.gif
+      - mindmap/ProjectGraph.gif

Makefile

@@ -37,6 +37,15 @@ bilder=\
 
 dokumente=$(mindmap) $(presentation)
 
+example=\
+	example/Makefile \
+	example/Dockerfile \
+	example/example.sh \
+	example/workdir/algo.py \
+	example/workdir/proof.tex \
+	example/workdir/.versions/* \
+	example/README.md
+
 latex=$(mindmap) $(presentation) $(grafiken)
 
 buildirs=$(latex:pdf=out)
@@ -45,7 +54,7 @@ previews=$(mindmap:pdf=gif)
 
 # Rules
 
-default: $(dokumente)
+default: $(dokumente) example/example.tar.gz
 
 all: $(latex) $(previews)
 
@@ -64,6 +73,8 @@ $(versionsgraphen) git-object: grafiken/versiongraph.tex
 
 $(presentation): $(grafiken) $(bilder) presentation/theme.tex
 
+example/example.tar.gz: $(example)
+	tar -acf $@ $^
 
 # Generic Recipes
 
@@ -87,6 +98,7 @@ $(presentation): $(grafiken) $(bilder) presentation/theme.tex
 clean: polish
 	rm -rf $(latex)
 	rm -rf $(previews)
+	rm -f  example/example.tar.gz
 
 polish:
 	rm -rf $(buildirs)

README.md

@@ -7,6 +7,7 @@ Sammlung aller Quellen, sowie MindMap über Themen/Begriffe.
   * [MindMap][mindmap pdf]
   * [ProjectGraph][projectgraph pdf]
   * [Präsentation][slides]
+  * [Ausführbares Beispiel][example]
 
 ## Mind Map
 
@@ -75,14 +76,17 @@ Sammlung aller Quellen, sowie MindMap über Themen/Begriffe.
 
 [mindmap pdf]:
 	https://git.cs.uni-paderborn.de/lukasngl/itt/-/jobs/artifacts/master/raw/mindmap/MindMap.pdf?job=mindmap
-[mindmap preview]:
-	https://git.cs.uni-paderborn.de/lukasngl/itt/-/jobs/artifacts/master/raw/mindmap/MindMap.gif?job=mindmap
 [projectgraph pdf]:
 	https://git.cs.uni-paderborn.de/lukasngl/itt/-/jobs/artifacts/master/raw/mindmap/ProjectGraph.pdf?job=mindmap
-[projectgraph preview]:
-	https://git.cs.uni-paderborn.de/lukasngl/itt/-/jobs/artifacts/master/raw/mindmap/ProjectGraph.gif?job=mindmap
 [slides]:
 	https://git.cs.uni-paderborn.de/lukasngl/itt/-/jobs/artifacts/master/raw/presentation/presentation.pdf?job=presentation
+[example]:
+	https://git.cs.uni-paderborn.de/lukasngl/itt/-/jobs/artifacts/master/raw/example/example.tar.gz?job=package-example
+[projectgraph preview]:
+	https://git.cs.uni-paderborn.de/lukasngl/itt/-/jobs/artifacts/master/raw/mindmap/ProjectGraph.gif?job=preview
+[mindmap preview]:
+	https://git.cs.uni-paderborn.de/lukasngl/itt/-/jobs/artifacts/master/raw/mindmap/MindMap.gif?job=preview
+
 
 [haenel2015]:
 	https://gitbu.ch

example/Dockerfile

@@ -7,3 +7,4 @@ RUN apk add --no-cache zsh git
 
 # copy the example
 COPY example.sh /example/example.sh
+COPY workdir /workdir

example/Makefile

 repos=alice bob github
 
 run: .docker-quiet | $(repos)
-	@docker run \
+	docker run \
 		-v ${PWD}/alice:/alice:rw \
 		-v ${PWD}/bob:/bob:rw \
 		-v ${PWD}/github:/github:rw \
-		-v ${PWD}/workdir:/workdir:rw \
-		-it example:latest
+		$${DFLAGS:--it} example:latest
 
 .docker-quiet: example.sh Dockerfile
 	docker build --quiet -t example:latest .

example/example.sh

 #!/bin/zsh
+setopt +o nomatch
 
 title() {
 	blue
@@ -276,7 +277,7 @@ rm -rf /alice/.git
 rm -rf /bob/.git
 rm -rf /github/.git
 
-trap SIGINT exit
+trap exit SIGINT SIGKILL SIGTERM
 
 TTY=NO
 if [ "`tty`" != "not a tty" ]; then TTY=YES; fi