verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 67 Releases Wiki Activity

Merge branch 'dev' of juan/salix into dev

This commit is contained in:
Juan Ferrer 2019-02-17 17:59:48 +00:00 committed by Gitea
parent 42e3fede23 3a56044634
commit 041a423102
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Jenkinsfile vendored
View File

@ -28,9 +28,6 @@ pipeline {
case 'test': case 'test':
env.PORT = 5001 env.PORT = 5001
break break
case 'test':
env.PORT = 5000
break
} }
switch (env.BRANCH_NAME) { switch (env.BRANCH_NAME) {
case 'master': case 'master':
@ -39,7 +36,7 @@ pipeline {
case 'test': case 'test':
env.NODE_ENV = 'test' env.NODE_ENV = 'test'
break break
case 'dev': default:
env.NODE_ENV = 'development' env.NODE_ENV = 'development'
break break
} }
@ -59,9 +56,10 @@ pipeline {
} }
} }
stage('Test') { stage('Test') {
when { when { not { anyOf {
branch 'dev' branch 'test'
} branch 'master'
}}}
environment { environment {
NODE_ENV = "" NODE_ENV = ""
FIREFOX_BIN = "/opt/firefox/firefox-bin" FIREFOX_BIN = "/opt/firefox/firefox-bin"
@ -75,9 +73,10 @@ pipeline {
} }
} }
stage('Build') { stage('Build') {
when { when { anyOf {
not { branch 'dev' } branch 'test'
} branch 'master'
}}
environment { environment {
CREDS = credentials('docker-registry') CREDS = credentials('docker-registry')
} }
@ -92,9 +91,10 @@ pipeline {
} }
} }
stage('Deploy') { stage('Deploy') {
when { when { anyOf {
not { branch 'dev' } branch 'test'
} branch 'master'
}}
environment { environment {
DOCKER_TLS_VERIFY = 1 DOCKER_TLS_VERIFY = 1
} }

2
front/salix/index.js
View File

@ -2,3 +2,5 @@ import './module';
import './routes'; import './routes';
import './components'; import './components';
import './styles'; import './styles';
// XXX: Pull request: Test 2