Commit 9317cf12 authored by Jean Meurice's avatar Jean Meurice
Browse files

Merge branch 'master' of...

Merge branch 'master' of https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/simulators/basic-simulator
parents 57bd79a9 697a3ab9
Pipeline #156956 failed with stage
in 9 minutes and 18 seconds
......@@ -22,34 +22,24 @@
stages:
- build
masterJobWindows:
stage: build
script:
- mvn clean deploy -s settings.xml
- cd target
- ren "basic-simulator-*.jar" "basic-simulator.jar"
tags:
- Windows10
only:
- master
artifacts:
paths:
- target/basic-simulator.jar
branchJobWindows:
stage: build
script:
- mvn clean install -s settings.xml
tags:
- Windows10
except:
- master
#jobWindows:
# stage: build
# script:
# - mvn clean install -s settings.xml
# tags:
# - Windows10
masterJobLinux:
stage: build
image: maven:3-jdk-8
before_script:
- apt-get update
- apt-get install -y libxext6
- apt-get install -y libxrender1
- apt-get install -y libxtst6
- apt-get install -y libopenjfx-java
script:
- mvn clean deploy -s settings.xml
only:
......@@ -58,6 +48,12 @@ masterJobLinux:
branchJobLinux:
stage: build
image: maven:3-jdk-8
before_script:
- apt-get update
- apt-get install -y libxext6
- apt-get install -y libxrender1
- apt-get install -y libxtst6
- apt-get install -y libopenjfx-java
script:
- mvn clean install -s settings.xml
except:
......
......@@ -42,7 +42,8 @@ public class App
try {
FileSystem fileSystem = new FileSystem(LibraryService.getWorkingDirectory());
//FileSystem fileSystem = new FileSystem(LibraryService.getWorkingDirectory());
FileSystem fileSystem = new FileSystem(System.getProperty("user.dir") + "/");
BasicController sim_controller = new BasicController(fileSystem);
if (args.length > 0){
......
......@@ -16,7 +16,8 @@ public class AppTest
@Test
public void basicSetupTest() throws Exception {
FileSystem fileSystem = new FileSystem(LibraryService.getWorkingDirectory());
//FileSystem fileSystem = new FileSystem(LibraryService.getWorkingDirectory());
FileSystem fileSystem = new FileSystem(System.getProperty("user.dir") + "/");
BasicController sim_controller = new BasicController(fileSystem);
sim_controller.initFromJsonScenario(FileSystem.getJson(fileSystem.getPath(Category.CategoryType.SCENARIOS.id, "straight.json")));
sim_controller.startSimulation();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment