Aufgrund einer Wartung wird GitLab am 26.10. zwischen 8:00 und 9:00 Uhr kurzzeitig nicht zur Verfügung stehen. / Due to maintenance, GitLab will be temporarily unavailable on 26.10. between 8:00 and 9:00 am.

Commit 50b40b68 authored by Evgeny Kusmenko's avatar Evgeny Kusmenko
Browse files

Merge branch 'gitlab-update' into 'master'

ee infrastructure

See merge request !10
parents 15ac1432 a372d218
Pipeline #188359 passed with stage
in 1 minute and 18 seconds
...@@ -5,13 +5,24 @@ ...@@ -5,13 +5,24 @@
# can be found under https://github.com/MontiCore/monticore. # can be found under https://github.com/MontiCore/monticore.
# #
stages: stages:
- build - build
masterJobLinux: masterJobLinux:
stage: build stage: build
image: maven:3-jdk-8 image: maven:3-jdk-8
before_script:
- apt update
- apt --assume-yes install libxext6
- apt --assume-yes install libxrender1
- apt --assume-yes install libxtst6
script: script:
- "JAWT_LIB=$(find / -name libjawt.so -print -quit)"
- "echo JAWT_LIB: $JAWT_LIB"
- "JAWT_FOLDER=$(dirname ${JAWT_LIB})"
- "echo JAWT_FOLDER: $JAWT_FOLDER"
- "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${JAWT_FOLDER}"
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean deploy --settings settings.xml - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean deploy --settings settings.xml
- mvn package sonar:sonar -s settings.xml - mvn package sonar:sonar -s settings.xml
only: only:
...@@ -35,12 +46,12 @@ BranchJobLinux: ...@@ -35,12 +46,12 @@ BranchJobLinux:
- apt --assume-yes install libxrender1 - apt --assume-yes install libxrender1
- apt --assume-yes install libxtst6 - apt --assume-yes install libxtst6
#- apt --assume-yes install realpath #- apt --assume-yes install realpath
script:
- "JAWT_LIB=$(find / -name libjawt.so -print -quit)" - "JAWT_LIB=$(find / -name libjawt.so -print -quit)"
- "echo JAWT_LIB: $JAWT_LIB" - "echo JAWT_LIB: $JAWT_LIB"
- "JAWT_FOLDER=$(dirname ${JAWT_LIB})" - "JAWT_FOLDER=$(dirname ${JAWT_LIB})"
- "echo JAWT_FOLDER: $JAWT_FOLDER" - "echo JAWT_FOLDER: $JAWT_FOLDER"
- "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${JAWT_FOLDER}" - "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${JAWT_FOLDER}"
script:
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml
except: except:
- master - master
......
# (c) https://github.com/MontiCore/monticore
script: script:
- git checkout ${TRAVIS_BRANCH} - git checkout ${TRAVIS_BRANCH}
......
<!-- (c) https://github.com/MontiCore/monticore -->
[![Build Status](https://travis-ci.org/MontiSim/RMIModelServer.svg?branch=master)](https://travis-ci.org/MontiSim/RMIModelServer) [![Build Status](https://travis-ci.org/MontiSim/RMIModelServer.svg?branch=master)](https://travis-ci.org/MontiSim/RMIModelServer)
[![Maintainability](https://api.codeclimate.com/v1/badges/55c8774bfd4d37534691/maintainability)](https://codeclimate.com/github/MontiSim/RMIModelServer/maintainability) [![Maintainability](https://api.codeclimate.com/v1/badges/55c8774bfd4d37534691/maintainability)](https://codeclimate.com/github/MontiSim/RMIModelServer/maintainability)
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
# can be found under https://github.com/MontiCore/monticore. # can be found under https://github.com/MontiCore/monticore.
# #
FROM openjdk:8 FROM openjdk:8
WORKDIR /app WORKDIR /app
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
# can be found under https://github.com/MontiCore/monticore. # can be found under https://github.com/MontiCore/monticore.
# #
rm rmi-model-server-*.jar rm rmi-model-server-*.jar
cp ../target/rmi-model-server-*-jar-with-dependencies.jar ./rmi-model-server.jar cp ../target/rmi-model-server-*-jar-with-dependencies.jar ./rmi-model-server.jar
cp ../install/HardwareEmulator.so ./ cp ../install/HardwareEmulator.so ./
......
\relax
\newlabel{emuconfig}{{}{1}}
\newlabel{tab:emuconfig}{{}{1}}
\newlabel{tab:managerconfig}{{}{1}}
\newlabel{tab:managerqueries}{{}{1}}
\newlabel{tab:emuqueries}{{}{1}}
# Fdb version 3
["pdflatex"] 1568890713 "b:/montisim-setup/repos/RMIModelServer/docs/latex/emulator_configuration.tex" "b:/montisim-setup/repos/RMIModelServer/docs/latex/emulator_configuration.pdf" "emulator_configuration" 1568890713
"C:/Program Files/MiKTeX 2.9/fonts/tfm/public/cm/cmbx10.tfm" 1136768653 1328 c834bbb027764024c09d3d2bf908b5f0 ""
"C:/Program Files/MiKTeX 2.9/fonts/tfm/public/cm/cmitt10.tfm" 1136768653 768 2297ad2ac26f37e67f756dad27c77d68 ""
"C:/Program Files/MiKTeX 2.9/fonts/tfm/public/cm/cmti10.tfm" 1136768653 1480 aa8e34af0eb6a2941b776984cf1dfdc4 ""
"C:/Program Files/MiKTeX 2.9/fonts/tfm/public/cm/cmtt10.tfm" 1136768653 768 1321e9409b4137d6fb428ac9dc956269 ""
"C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmbx10.pfb" 1247596666 34811 78b52f49e893bcba91bd7581cdc144c0 ""
"C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmitt10.pfb" 1247596666 26057 4749ebe351ca6b60601cf0ab49d1bf5d ""
"C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmmi10.pfb" 1247596667 36299 5f9df58c2139e7edcf37c8fca4bd384d ""
"C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmmi7.pfb" 1247596667 36281 c355509802a035cadc5f15869451dcee ""
"C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmr10.pfb" 1247596667 35752 024fb6c41858982481f6968b5fc26508 ""
"C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmsy10.pfb" 1247596667 32569 5e5ddc8df908dea60932f3c484a54c0d ""
"C:/Program Files/MiKTeX 2.9/fonts/type1/public/amsfonts/cm/cmtt10.pfb" 1247596667 31099 342ef5a582aacbd3346f3cf4579679fa ""
"C:/Users/Jean/AppData/Local/MiKTeX/2.9/miktex/data/le/pdftex/pdflatex.fmt" 1562925836 4235381 0468f7ea654e25346755a1cc34bf5b43 ""
"C:/Users/Jean/AppData/Local/MiKTeX/2.9/pdftex/config/pdftex.map" 1562925912 80453 73224248f0a73acd005b5611945eaaa6 ""
"b:/montisim-setup/repos/RMIModelServer/docs/latex/emulator_configuration.aux" 1568890713 9 a94a2480d3289e625eea47cd1b285758 ""
"b:/montisim-setup/repos/RMIModelServer/docs/latex/emulator_configuration.tex" 1568890711 8550 c3bfea48587967d0f21fa2e13e69064c ""
"emulator_configuration.aux" 0 -1 0 "pdflatex"
"emulator_configuration.tex" 1568890711 8550 c3bfea48587967d0f21fa2e13e69064c ""
(generated)
"emulator_configuration.aux"
"emulator_configuration.pdf"
"b:/montisim-setup/repos/RMIModelServer/docs/latex/emulator_configuration.log"
"emulator_configuration.log"
"b:/montisim-setup/repos/RMIModelServer/docs/latex/emulator_configuration.pdf"
PWD b:\montisim-setup\repos\RMIModelServer\docs\latex
INPUT C:\Users\Jean\AppData\Local\MiKTeX\2.9\miktex\data\le\pdftex\pdflatex.fmt
INPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.tex
OUTPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.log
INPUT C:\Program Files\MiKTeX 2.9\fonts\tfm\public\cm\cmtt10.tfm
INPUT C:\Program Files\MiKTeX 2.9\fonts\tfm\public\cm\cmitt10.tfm
INPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.aux
INPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.aux
OUTPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.aux
INPUT C:\Program Files\MiKTeX 2.9\fonts\tfm\public\cm\cmbx10.tfm
INPUT C:\Program Files\MiKTeX 2.9\fonts\tfm\public\cm\cmti10.tfm
OUTPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.pdf
INPUT C:\Users\Jean\AppData\Local\MiKTeX\2.9\pdftex\config\pdftex.map
INPUT b:\montisim-setup\repos\RMIModelServer\docs\latex\emulator_configuration.aux
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmbx10.pfb
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmbx10.pfb
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmitt10.pfb
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmitt10.pfb
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmmi10.pfb
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmmi10.pfb
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmmi7.pfb
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmmi7.pfb
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmr10.pfb
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmr10.pfb
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmsy10.pfb
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmsy10.pfb
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmtt10.pfb
INPUT C:\Program Files\MiKTeX 2.9\fonts\type1\public\amsfonts\cm\cmtt10.pfb
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -3,7 +3,6 @@ ...@@ -3,7 +3,6 @@
% The license generally applicable for this project % The license generally applicable for this project
% can be found under https://github.com/MontiCore/monticore. % can be found under https://github.com/MontiCore/monticore.
\usepackage{graphicx} \usepackage{graphicx}
%\usepackage{ngerman} %\usepackage{ngerman}
\usepackage[utf8x]{inputenc} \usepackage[utf8x]{inputenc}
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
@REM can be found under https://github.com/MontiCore/monticore. @REM can be found under https://github.com/MontiCore/monticore.
@REM @REM
@echo off @echo off
set GENDIR=target\ set GENDIR=target\
set MAINNAME=emulator_configuration set MAINNAME=emulator_configuration
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
@REM can be found under https://github.com/MontiCore/monticore. @REM can be found under https://github.com/MontiCore/monticore.
@REM @REM
@REM Please replace this with the path to the Autopilot(s) @REM Please replace this with the path to the Autopilot(s)
set AUTOPILOT_FOLDER=autopilots set AUTOPILOT_FOLDER=autopilots
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
# can be found under https://github.com/MontiCore/monticore. # can be found under https://github.com/MontiCore/monticore.
# #
# Please replace this with the path to the Autopilot(s) # Please replace this with the path to the Autopilot(s)
AUTOPILOT_FOLDER=autopilots AUTOPILOT_FOLDER=autopilots
......
@REM
@REM (c) https://github.com/MontiCore/monticore
@REM
@REM The license generally applicable for this project
@REM can be found under https://github.com/MontiCore/monticore.
@REM
@echo off
pushd ..
call run.bat os=linux cpu_frequency=10000000 memory_frequency=1000000 cache_DL1=128,1,2 cache_IL1=128,1,2 cache_L2=1024,10,15 export debug=unsupported_syscalls
popd
@REM
@REM (c) https://github.com/MontiCore/monticore
@REM
@REM The license generally applicable for this project
@REM can be found under https://github.com/MontiCore/monticore.
@REM
@echo off
pushd ..
call run.bat test_real os=windows cpu_frequency=10000000 memory_frequency=1000000 cache_DL1=128,1,2 cache_IL1=128,1,2 cache_L2=1024,10,15 export
popd
@REM
@REM (c) https://github.com/MontiCore/monticore
@REM
@REM The license generally applicable for this project
@REM can be found under https://github.com/MontiCore/monticore.
@REM
@echo off
pushd ..
call run.bat test_real os=windows cpu_frequency=10000000 memory_frequency=1000000 export
popd
@REM
@REM (c) https://github.com/MontiCore/monticore
@REM
@REM The license generally applicable for this project
@REM can be found under https://github.com/MontiCore/monticore.
@REM
@echo off
pushd ..
call run.bat os=windows no_time test_real
popd
@REM
@REM (c) https://github.com/MontiCore/monticore
@REM
@REM The license generally applicable for this project
@REM can be found under https://github.com/MontiCore/monticore.
@REM
@echo off
pushd ..
call run.bat test_real os=windows cpu_frequency=1500000 memory_frequency=150000 cache_DL1=128,1,2 cache_IL1=128,1,2 cache_L2=1024,10,15 export
popd
Markdown is supported
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