mirror of
https://gitlab.com/hoggit/developers/hoggit.git
synced 2025-11-10 15:43:28 +00:00
Fixed Jenkinfile mess from rebase
This commit is contained in:
parent
7f60933f3b
commit
388010550c
15
Jenkinsfile
vendored
15
Jenkinsfile
vendored
@ -5,20 +5,6 @@ pipeline {
|
||||
stage('Build') {
|
||||
steps {
|
||||
sh '/opt/squish/bin/squish --no-minify'
|
||||
<<<<<<< HEAD
|
||||
sh 'ldoc {env.WORKSPACE}'
|
||||
}
|
||||
}
|
||||
/* stage('Deploy') {
|
||||
when {
|
||||
branch 'production'
|
||||
}
|
||||
|
||||
steps {
|
||||
|
||||
}
|
||||
}*/
|
||||
=======
|
||||
sh "ldoc ${env.WORKSPACE}"
|
||||
}
|
||||
}
|
||||
@ -31,6 +17,5 @@ pipeline {
|
||||
sh "python3 /opt/hoggit_releaser/releaser.py ${env.WORKSPACE} ${env.TAG_NAME}"
|
||||
}
|
||||
}
|
||||
>>>>>>> feature/Jenkinsfile
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user