From 087a895e9e4d366342e1700f84977dceb44ca1e6 Mon Sep 17 00:00:00 2001
From: "Bernhard J. Berger" <bernhard.berger@uni-bremen.de>
Date: Mon, 13 Feb 2023 21:38:32 +0100
Subject: [PATCH] Fixing build system.
---
.gitlab-ci.yml | 12 ++++++------
.../java/de/evoal/core/api/utils/LanguageHelper.java | 4 +++-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d48623c5..fc66a9ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -86,8 +86,8 @@ evoal:compile:
- docker
image: $EVOAL_IMAGE
script:
- - mvn $MAVEN_CLI_OPTS -f $MAIN_POM install
- - mvn $MAVEN_CLI_OPTS -f $PLUGIN_POM install
+ - mvn $MAVEN_CLI_OPTS -f $MAIN_POM -DskipTests=true install
+ - mvn $MAVEN_CLI_OPTS -f $PLUGIN_POM -DskipTests=true install
- mvn $MAVEN_CLI_OPTS -f $EVOAL_POM compile
artifacts:
untracked: false
@@ -106,8 +106,8 @@ evoal:unit:
- docker
image: $EVOAL_IMAGE
script:
- - mvn $MAVEN_CLI_OPTS -f $MAIN_POM install
- - mvn $MAVEN_CLI_OPTS -f $PLUGIN_POM install
+ - mvn $MAVEN_CLI_OPTS -f $MAIN_POM -DskipTests=true install
+ - mvn $MAVEN_CLI_OPTS -f $PLUGIN_POM -DskipTests=true install
- mvn $MAVEN_CLI_OPTS -f $EVOAL_POM verify
artifacts:
when: always
@@ -133,8 +133,8 @@ evoal:deploy:
- docker
image: $EVOAL_IMAGE
script:
- - mvn $MAVEN_CLI_OPTS -f $MAIN_POM install
- - mvn $MAVEN_CLI_OPTS -f $PLUGIN_POM install
+ - mvn $MAVEN_CLI_OPTS -f $MAIN_POM -DskipTests=true install
+ - mvn $MAVEN_CLI_OPTS -f $PLUGIN_POM -DskipTests=true install
- mvn $MAVEN_CLI_OPTS -f $EVOAL_POM -DskipTests=true deploy
artifacts:
untracked: false
diff --git a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/LanguageHelper.java b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/LanguageHelper.java
index cd8daffb..9ffee546 100644
--- a/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/LanguageHelper.java
+++ b/src/core/de.evoal.core.main/src/main/java/de/evoal/core/api/utils/LanguageHelper.java
@@ -1,6 +1,7 @@
package de.evoal.core.api.utils;
import de.evoal.languages.model.dl.*;
+import de.evoal.languages.model.el.BooleanLiteral;
import de.evoal.languages.model.instance.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -112,7 +113,8 @@ public final class LanguageHelper {
} else if(type instanceof StringType) {
return Objects.toString(((LiteralValue)current).getLiteral().getValue());
} else if(type instanceof BooleanType) {
- return Boolean.TRUE.equals(((LiteralValue)current).getLiteral().getValue());
+ // TODO Fix hard call to is value
+ return Boolean.TRUE.equals(((BooleanLiteral)((LiteralValue)current).getLiteral()).isValue());
}
throw new UnsupportedOperationException("Type " + type.toString() + " is not supported.");
--
GitLab