Merge branch 'ruben/jenkins_migration' of github.com:carla-simulator/carla into dev
This commit is contained in:
commit
2c85c528cc
|
@ -132,7 +132,7 @@ pipeline
|
||||||
dir('doc_repo')
|
dir('doc_repo')
|
||||||
{
|
{
|
||||||
checkout scmGit(
|
checkout scmGit(
|
||||||
branches: [[name: '*/master']],
|
branches: [[name: '*/dev']],
|
||||||
extensions: [
|
extensions: [
|
||||||
cleanBeforeCheckout(),
|
cleanBeforeCheckout(),
|
||||||
checkoutOption(120),
|
checkoutOption(120),
|
||||||
|
@ -316,7 +316,7 @@ pipeline
|
||||||
tar -xvzf carla_doc.tar.gz
|
tar -xvzf carla_doc.tar.gz
|
||||||
git add Doxygen
|
git add Doxygen
|
||||||
git commit -m "Updated c++ docs" || true
|
git commit -m "Updated c++ docs" || true
|
||||||
git push --set-upstream origin master
|
git push --set-upstream origin dev
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue