Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
monticore
EmbeddedMontiArc
languages
CNNTrainLang
Commits
bc278be0
Commit
bc278be0
authored
Oct 26, 2020
by
Evgeny Kusmenko
Browse files
Merge branch 'master' into 'develop'
merge Master into dev See merge request
!31
parents
fe10fd90
07b44831
Pipeline
#348568
passed with stage
in 4 minutes and 52 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
bc278be0
...
...
@@ -11,6 +11,28 @@ stages:
#- windows
-
linux
githubjob
:
image
:
maven:3-jdk-8
stage
:
linux
before_script
:
-
'
which
ssh-agent
||
(
apt-get
update
-y
&&
apt-get
install
openssh-client
-y
)'
-
eval $(ssh-agent -s)
-
ssh-add <(echo "$GITHUB_SSH_PRIV_KEY")
-
echo "$GITHUB_SSH_PRIV_KEY" | tr -d '\r' | ssh-add -
-
git config --global user.email "kusmenko@se-rwth.de"
-
git config --global user.name "EMA CI Robot"
-
mkdir -p ~/.ssh
# - cat gitlab-known-hosts >> ~/.ssh/known_hosts
-
echo -e "Host github.com\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config
script
:
-
git clone git@github.com:MontiCore/EmbeddedMontiArc.git
-
cd EmbeddedMontiArc
-
git subtree pull --prefix $PRJ_NAME https://git.rwth-aachen.de/monticore/EmbeddedMontiArc/${PRJ_NAME}.git master --squash
-
git push --force
only
:
-
master
masterJobLinux
:
stage
:
linux
image
:
maven:3-jdk-8
...
...
@@ -18,9 +40,13 @@ masterJobLinux:
-
mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean deploy --settings settings.xml
-
cat target/site/jacoco/index.html
-
mvn package sonar:sonar -s settings.xml
only
:
-
master
except
:
changes
:
-
.gitlab-ci.yml
-
.README.md
-
.gitignore
#masterJobWindows:
# stage: windows
...
...
pom.xml
View file @
bc278be0
...
...
@@ -18,7 +18,7 @@
<groupId>
de.monticore.lang.monticar
</groupId>
<artifactId>
cnn-train
</artifactId>
<version>
0.
3.12
-SNAPSHOT
</version>
<version>
0.
4.0
-SNAPSHOT
</version>
<!-- == PROJECT DEPENDENCIES ============================================= -->
...
...
@@ -28,11 +28,11 @@
<monticore.version>
5.0.1
</monticore.version>
<se-commons.version>
1.7.8
</se-commons.version>
<mc.grammars.assembly.version>
0.0.6
</mc.grammars.assembly.version>
<Common-MontiCar.version>
0.
0
.1
9
-SNAPSHOT
</Common-MontiCar.version>
<Common-MontiCar.version>
0.
2
.1
2
-SNAPSHOT
</Common-MontiCar.version>
<!-- .. Libraries .................................................. -->
<guava.version>
18.0
</guava.version>
<junit.version>
4.1
2
</junit.version>
<guava.version>
25.1-jre
</guava.version>
<junit.version>
4.1
3.1
</junit.version>
<logback.version>
1.1.2
</logback.version>
<jscience.version>
4.3.1
</jscience.version>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment