Merge branch 'dev' of juan/salix into dev
gitea/salix/dev There was a failure building this commit Details

This commit is contained in:
Juan Ferrer 2019-02-18 07:49:44 +00:00 committed by Gitea
commit 2fc36e1f40
1 changed files with 4 additions and 6 deletions

10
Jenkinsfile vendored
View File

@ -36,9 +36,6 @@ pipeline {
case 'test': case 'test':
env.NODE_ENV = 'test' env.NODE_ENV = 'test'
break break
default:
env.NODE_ENV = 'development'
break
} }
} }
echo "Committer: ${env.GIT_COMMITTER_EMAIL}" echo "Committer: ${env.GIT_COMMITTER_EMAIL}"
@ -124,9 +121,10 @@ pipeline {
} }
} }
stage('Cleanup') { stage('Cleanup') {
when { when { anyOf {
not { branch 'dev' } branch 'test'
} branch 'master'
}}
steps { steps {
sh 'docker logout $REGISTRY' sh 'docker logout $REGISTRY'
} }