From 07fbb95e00228be6b0d7ef207d99296ce4ffd1f0 Mon Sep 17 00:00:00 2001
From: Hallvard Traetteberg <hal@ntnu.no>
Date: Thu, 22 Mar 2018 10:48:37 +0100
Subject: [PATCH] Update readme and change CI build config in .gitlab-ci.yml
---
.gitlab-ci.yml | 25 ++++++++++++++-----------
tdt4140-gr1800/README.md | 9 +++++++++
2 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 228cea0..7da22e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,25 +14,28 @@ variables:
MAVEN_OPTS: "-Djava.awt.headless=true -Dmaven.repo.local=.m2/repository"
MAVEN_CLI_OPTS: "--batch-mode --errors --fail-at-end --show-version -Dgitlab-ci=true"
-build-job:
- stage: build
- script:
- - "mvn clean compile -f tdt4140-gr18nn/pom.xml $MAVEN_CLI_OPTS"
- - "mvn clean compile -f tdt4140-gr1800/pom.xml $MAVEN_CLI_OPTS"
+#build-job:
+# stage: build
+# script:
+# - "mvn clean compile -f tdt4140-gr18nn/pom.xml $MAVEN_CLI_OPTS"
+# - "mvn clean compile -f tdt4140-gr1800/pom.xml $MAVEN_CLI_OPTS"
unittest-job:
stage: test
- dependencies:
- - build-job
+# dependencies:
+# - build-job
script:
- - "mvn package -f tdt4140-gr18nn/pom.xml $MAVEN_CLI_OPTS"
- - "mvn package -f tdt4140-gr1800/pom.xml $MAVEN_CLI_OPTS"
+ - "mvn test -f tdt4140-gr18nn/pom.xml $MAVEN_CLI_OPTS"
+ - "mvn test -f tdt4140-gr1800/pom.xml $MAVEN_CLI_OPTS"
- "cat tdt4140-gr1800/app.core/target/site/jacoco/index.html"
integrationtest-job:
stage: test
- dependencies:
- - build-job
+ only:
+ - web
+# dependencies:
+# - build-job
script:
- "mvn verify -f tdt4140-gr18nn/pom.xml $MAVEN_CLI_OPTS"
- "mvn verify -f tdt4140-gr1800/pom.xml $MAVEN_CLI_OPTS"
+
diff --git a/tdt4140-gr1800/README.md b/tdt4140-gr1800/README.md
index 8c66f73..56d967f 100644
--- a/tdt4140-gr1800/README.md
+++ b/tdt4140-gr1800/README.md
@@ -1,3 +1,12 @@
# Example project for the TDT4140 course, Spring 2018
This project is an example for Spring 2018, based on the [template project](../tdt4140-gr18nn/README.md)
+
+## The example project
+
+The example project is meant to illustrate the expected architecture, as well as demonstrate relevant implementation techniques, including project and build configuration and coding and library usage.
+
+This project is about managing sets of geo-locations, like tracks from hiking og training, similar to what you get from apps like Strava. The project includes two systems:
+* a JavaFX app for visualising, analysing and editing sets of geo-locations
+* web server with a REST API for managing sets of geo-locations, primarily for collecting the geo-locations from apps, but also as persistence layer for the JavaFX app
+
--
GitLab