Commit ef3859ed authored by Nicola Gatto's avatar Nicola Gatto

Merge branch 'master' into integrate-reinforcement-gluon

parents 9ea86925 16023357
...@@ -53,6 +53,10 @@ integrationGluonJobLinux: ...@@ -53,6 +53,10 @@ integrationGluonJobLinux:
script: script:
- mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml -Dtest=IntegrationGluonTest - mvn -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn -B clean install --settings settings.xml -Dtest=IntegrationGluonTest
<<<<<<< HEAD
=======
>>>>>>> master
masterJobWindows: masterJobWindows:
stage: windows stage: windows
script: script:
......
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