From eabdb6f39d47698738561921ade1840908fa589f Mon Sep 17 00:00:00 2001 From: Wouter Horlings Date: Thu, 10 Sep 2020 15:59:35 +0200 Subject: [PATCH 1/5] Add gitignore-file and common module --- .gitignore | 2 ++ .gitmodules | 3 +++ common | 1 + 3 files changed, 6 insertions(+) create mode 100644 .gitignore create mode 100644 .gitmodules create mode 160000 common diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..58efebe --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/*.rro +/*.pdf diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..6964578 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "common"] + path = common + url = ssh://git@git.ram.eemcs.utwente.nl:20022/horlingsw/mac.git diff --git a/common b/common new file mode 160000 index 0000000..9824d62 --- /dev/null +++ b/common @@ -0,0 +1 @@ +Subproject commit 9824d626fd1bf2cdc4d03c4109500629ffe16a20 From 7d5114331040a5fc60e713c87ce159d029e7c0ed Mon Sep 17 00:00:00 2001 From: Wouter Horlings Date: Thu, 10 Sep 2020 16:00:19 +0200 Subject: [PATCH 2/5] Add report template --- report.tex | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 report.tex diff --git a/report.tex b/report.tex new file mode 100644 index 0000000..cf795c0 --- /dev/null +++ b/report.tex @@ -0,0 +1,25 @@ +\documentclass[english,titlepage,nomath,nopackage,oneside]{siltex-book} +\include{include/preamble} + +\title{Title} +\subtitle{Thesis Report} +\course{} +\faculty{\large Electrical Engineering, Mathematics and Computer Science} +\supervisor{% + Dr. ir. J.F. Broenink \\ + Ir. T.G. Broenink +} +\author{% + Wouter Horlings +} + +\begin{document} +\maketitle +\makerro +\tableofcontents +\include{include/acronyms} + +%\include{introduction} + +\printbibliography +\end{document} From 582fb549181a51b79f7d6597c5fd6da461774ff1 Mon Sep 17 00:00:00 2001 From: Wouter Horlings Date: Mon, 12 Oct 2020 14:08:50 +0200 Subject: [PATCH 3/5] Add issue template --- .gitlab/issue_templates/New Chapter.md | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .gitlab/issue_templates/New Chapter.md diff --git a/.gitlab/issue_templates/New Chapter.md b/.gitlab/issue_templates/New Chapter.md new file mode 100644 index 0000000..994e5e4 --- /dev/null +++ b/.gitlab/issue_templates/New Chapter.md @@ -0,0 +1,31 @@ +Chapter \# +========== + +This is about: + + +## Content +- [] section x + - [] Written + - [] Read + - [] Review + - [] Needs edits + +- [] section y + - [] Written + - [] Read + - [] Review + - [] Needs edits + +- [] section y + - [] Written + - [] Read + - [] Review + - [] Needs edits + +## Reviewed by: + - [] Maureen + - [] Daan + - [] Tim + - [] Jan + From e9215804bc8d5c06d1b969776eb589c22a9ea7fa Mon Sep 17 00:00:00 2001 From: Wouter Horlings Date: Mon, 12 Oct 2020 14:14:49 +0200 Subject: [PATCH 4/5] updated submodule --- .gitmodules | 2 +- common | 1 - include | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) delete mode 160000 common create mode 160000 include diff --git a/.gitmodules b/.gitmodules index 6964578..68d937b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "common"] - path = common + path = include url = ssh://git@git.ram.eemcs.utwente.nl:20022/horlingsw/mac.git diff --git a/common b/common deleted file mode 160000 index 9824d62..0000000 --- a/common +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9824d626fd1bf2cdc4d03c4109500629ffe16a20 diff --git a/include b/include new file mode 160000 index 0000000..696eebe --- /dev/null +++ b/include @@ -0,0 +1 @@ +Subproject commit 696eebe3534f7e5133f8c2c4fa1f9c84e0910997 From 91b106e78ad8268fdb49d2a7bf7cfbf84903f35c Mon Sep 17 00:00:00 2001 From: Wouter Horlings Date: Thu, 10 Sep 2020 17:09:27 +0200 Subject: [PATCH 5/5] Add gitlab ci config --- .gitlab-ci.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..359ae45 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,49 @@ + +--- +stages: + - typeset + - rro + +variables: + GIT_SUBMODULE_STRATEGY: recursive + + +final_report: + stage: typeset + image: registry.gitlab.com/silkeh/latex:latest + script: + - latexmk -xelatex report.tex + - mkdir tmp + - mv RichReportOutline.rro tmp/ + artifacts: + paths: + - report.pdf + - tmp/RichReportOutline.rro + only: + refs: + - web + - branches + - tags + changes: + - include/*.tex + - include/references.bib + - report.tex + - content/*.tex + +rro: + stage: rro + dependencies: + - final_report + image: registry.gitlab.com/silkeh/latex:latest + script: + - latexmk -xelatex include/RichReportOutline.tex + artifacts: + paths: + - RichReportOutline.pdf + only: + refs: + - web + - branches + - tags + changes: + - tmp/RichReportOutline.rro