From e50d7ad5905705470d2ef332e0428d779f691412 Mon Sep 17 00:00:00 2001
From: ankit kariryaa <kariryaa@fhi-berlin.mpg.de>
Date: Thu, 28 Apr 2016 17:09:23 +0200
Subject: [PATCH] Add nomad meta info version and update ci script
---
.gitlab-ci.yml | 3 +--
src/main/scala/eu/nomad_lab/parsers/DlPolyParser.scala | 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f42591..6bbdd25 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,5 +14,4 @@ testing:
- master
tags:
- test
- - spec2
- allow_failure: true
\ No newline at end of file
+ - spec2
\ No newline at end of file
diff --git a/src/main/scala/eu/nomad_lab/parsers/DlPolyParser.scala b/src/main/scala/eu/nomad_lab/parsers/DlPolyParser.scala
index cffa496..4a57ec7 100644
--- a/src/main/scala/eu/nomad_lab/parsers/DlPolyParser.scala
+++ b/src/main/scala/eu/nomad_lab/parsers/DlPolyParser.scala
@@ -11,7 +11,9 @@ object DlPolyParser extends SimpleExternalParserGenerator(
("name" -> jn.JString("DlPolyParser")) ::
("parserId" -> jn.JString("DlPolyParser" + lab.DlPolyVersionInfo.version)) ::
("versionInfo" -> jn.JObject(
- ("nomadCoreVersion" -> jn.JString(lab.NomadCoreVersionInfo.version)) ::
+ ("nomadCoreVersion" -> jn.JObject(lab.NomadCoreVersionInfo.toMap.map {
+ case (k, v) => k -> jn.JString(v.toString)
+ }(breakOut): List[(String, jn.JString)])) ::
(lab.DlPolyVersionInfo.toMap.map {
case (key, value) =>
(key -> jn.JString(value.toString))
--
GitLab