merge fix

parents c82328ea d28906bd
Pipeline #348546 passed with stage
in 7 minutes and 59 seconds
...@@ -22,6 +22,28 @@ stages: ...@@ -22,6 +22,28 @@ stages:
# variables: # variables:
# MAVEN_CLI_OPTS: --settings=settings.xml # MAVEN_CLI_OPTS: --settings=settings.xml
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: masterJobLinux:
stage: linux stage: linux
image: maven:3-jdk-8 image: maven:3-jdk-8
...@@ -54,7 +76,3 @@ BranchJobLinux: ...@@ -54,7 +76,3 @@ BranchJobLinux:
- 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
except:
changes:
- README.md
- .gitignore
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<groupId>de.monticore.lang.monticar</groupId> <groupId>de.monticore.lang.monticar</groupId>
<artifactId>cnn-arch</artifactId> <artifactId>cnn-arch</artifactId>
<version>0.3.7-SNAPSHOT</version> <version>0.4.0-SNAPSHOT</version>
...@@ -32,12 +32,12 @@ ...@@ -32,12 +32,12 @@
<se-commons.version>1.7.8</se-commons.version> <se-commons.version>1.7.8</se-commons.version>
<mc.grammars.assembly.version>0.0.6</mc.grammars.assembly.version> <mc.grammars.assembly.version>0.0.6</mc.grammars.assembly.version>
<SIUnit.version>0.0.11</SIUnit.version> <SIUnit.version>0.0.11</SIUnit.version>
<Common-MontiCar.version>0.0.19-SNAPSHOT</Common-MontiCar.version> <Common-MontiCar.version>0.2.12-SNAPSHOT</Common-MontiCar.version>
<Math.version>0.2.12-SNAPSHOT</Math.version> <Math.version>0.2.12-SNAPSHOT</Math.version>
<!-- .. Libraries .................................................. --> <!-- .. Libraries .................................................. -->
<guava.version>18.0</guava.version> <guava.version>25.1-jre</guava.version>
<junit.version>4.12</junit.version> <junit.version>4.13.1</junit.version>
<logback.version>1.1.2</logback.version> <logback.version>1.1.2</logback.version>
<jscience.version>4.3.1</jscience.version> <jscience.version>4.3.1</jscience.version>
<commons-cli.version>1.4</commons-cli.version> <commons-cli.version>1.4</commons-cli.version>
......
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