Merge branch 'dev' of juan/salix into dev
gitea/salix/dev This commit has test failures Details

This commit is contained in:
Juan Ferrer 2019-02-17 18:50:00 +00:00 committed by Gitea
commit 56bc860fa0
1 changed files with 1 additions and 1 deletions

2
Jenkinsfile vendored
View File

@ -135,7 +135,7 @@ pipeline {
post { post {
always { always {
script { script {
if (env.BRANCH_NAME == 'dev') { if (!['master', 'test'].contains(env.BRANCH_NAME)) {
try { try {
junit '*/junitresults.xml' junit '*/junitresults.xml'
junit 'junitresults.xml' junit 'junitresults.xml'