weyne/hoggit
1
0
Fork 0
mirror of https://gitlab.com/hoggit/developers/hoggit.git synced 2025-11-10 15:43:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Jenkinfile mess from rebase

Browse Source
This commit is contained in:
Jeremy Smitherman 2018-12-26 01:44:42 -06:00
parent 7f60933f3b
commit 388010550c
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Jenkinsfile vendored
View File

@ -5,20 +5,6 @@ pipeline {
stage('Build') { stage('Build') {
steps { steps {
sh '/opt/squish/bin/squish --no-minify' sh '/opt/squish/bin/squish --no-minify'
<<<<<<< HEAD
sh 'ldoc {env.WORKSPACE}'
}
}
/* stage('Deploy') {
when {
branch 'production'
}
steps {
}
}*/
=======
sh "ldoc ${env.WORKSPACE}" sh "ldoc ${env.WORKSPACE}"
} }
} }
@ -31,6 +17,5 @@ pipeline {
sh "python3 /opt/hoggit_releaser/releaser.py ${env.WORKSPACE} ${env.TAG_NAME}" sh "python3 /opt/hoggit_releaser/releaser.py ${env.WORKSPACE} ${env.TAG_NAME}"
} }
} }
>>>>>>> feature/Jenkinsfile
} }
} }