Commit 9ee5c9c5 authored by Julian Dierkes's avatar Julian Dierkes
Browse files

Merge branch 'master' of...

Merge branch 'master' of git.rwth-aachen.de:monticore/EmbeddedMontiArc/generators/CNNArch2Gluon into develop
parents b43861f8 67579b12
...@@ -13,6 +13,12 @@ masterJobLinux: ...@@ -13,6 +13,12 @@ masterJobLinux:
- mvn package sonar:sonar -s settings.xml - mvn package sonar:sonar -s settings.xml
only: only:
- master - master
except:
changes:
- README.md
- .gitignore
- .gitlab-ci.yml
masterJobWindows: masterJobWindows:
stage: windows stage: windows
...@@ -20,6 +26,12 @@ masterJobWindows: ...@@ -20,6 +26,12 @@ masterJobWindows:
- 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
tags: tags:
- Windows10 - Windows10
except:
changes:
- README.md
- .gitignore
- .gitlab-ci.yml
BranchJobLinux: BranchJobLinux:
stage: linux stage: linux
...@@ -29,3 +41,9 @@ BranchJobLinux: ...@@ -29,3 +41,9 @@ BranchJobLinux:
- cat target/site/jacoco/index.html - cat target/site/jacoco/index.html
except: except:
- master - master
except:
changes:
- README.md
- .gitignore
- .gitlab-ci.yml
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