Skip to content

Commit cef21a0

Browse files
committed
Merge branch 'master' of github.com:cgtuebingen/infomark
2 parents 09977a3 + d42879e commit cef21a0

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

dockerimages/unittests/java/run.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ TEST_FILE="$DATA_DIR/unittest.zip"
1010

1111
# unpack submission
1212
cd ${HOME_DIR}/java/src
13-
unzip ${SUBMISSION_FILE}
13+
unzip -o ${SUBMISSION_FILE} || true
1414

1515
# consider the existance of a __unittest folder as attack!
1616
lines=$(find ${HOME_DIR}/java/src/ -type d -name "__unittest" | wc -l)
@@ -33,7 +33,7 @@ find ${HOME_DIR}/java/src/ -name "module-info.java" -type f -delete
3333

3434
# unzip tests
3535
cd ${HOME_DIR}/java
36-
unzip ${TEST_FILE} >/dev/null 2>&1
36+
unzip -o ${TEST_FILE} >/dev/null 2>&1
3737
chmod -R 555 ${HOME_DIR}/java/src/__unittest
3838

3939
# run unit tests

dockerimages/unittests/java/setup/junit_xml_report_translator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ def main():
8181
markdown = ""
8282
for r in reports:
8383
report = ErrorReport(r)
84-
markdown += report.GetMarkdown()
84+
markdown += report.GetMarkdown()
8585

8686
# TODO PREAMBLE
8787
# print("--- BEGIN --- INFOMARK -- WORKER")

docs/themes/infomark.org/layouts/partials/header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<a class="nav-link" href="/">Start</a>
1414
</li>
1515
<li class="nav-item dropdown">
16-
<a class="nav-link dropdown-toggle" href="http://example.com" id="dropdown01" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Documentation</a>
16+
<a class="nav-link dropdown-toggle" href="#" id="dropdown01" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Documentation</a>
1717
<div class="dropdown-menu" aria-labelledby="dropdown01">
1818
<a class="dropdown-item" href="/guides/overview/">Overview</a>
1919
<a class="dropdown-item" href="/guides/administrator/">Administrator's Guide</a>

0 commit comments

Comments
 (0)