mirror of
https://github.com/triqs/dft_tools
synced 2024-06-30 00:44:34 +02:00
[jenkins] try a more robust git push
This commit is contained in:
parent
a42838a8db
commit
29b5018018
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
|
@ -107,7 +107,7 @@ try {
|
||||||
git commit --author='Flatiron Jenkins <jenkins@flatironinstitute.org>' --allow-empty -m 'Generated documentation for ${subdir}' -m '${env.BUILD_TAG} ${commit}'
|
git commit --author='Flatiron Jenkins <jenkins@flatironinstitute.org>' --allow-empty -m 'Generated documentation for ${subdir}' -m '${env.BUILD_TAG} ${commit}'
|
||||||
"""
|
"""
|
||||||
// note: credentials used above don't work (need JENKINS-28335)
|
// note: credentials used above don't work (need JENKINS-28335)
|
||||||
sh "git push origin master"
|
sh "git push origin master || { git pull --rebase origin master && git push origin master ; }"
|
||||||
}
|
}
|
||||||
/* Update docker repo submodule */
|
/* Update docker repo submodule */
|
||||||
dir("$workDir/docker") { try {
|
dir("$workDir/docker") { try {
|
||||||
|
@ -117,7 +117,7 @@ try {
|
||||||
git commit --author='Flatiron Jenkins <jenkins@flatironinstitute.org>' --allow-empty -m 'Autoupdate ${projectName}' -m '${env.BUILD_TAG}'
|
git commit --author='Flatiron Jenkins <jenkins@flatironinstitute.org>' --allow-empty -m 'Autoupdate ${projectName}' -m '${env.BUILD_TAG}'
|
||||||
"""
|
"""
|
||||||
// note: credentials used above don't work (need JENKINS-28335)
|
// note: credentials used above don't work (need JENKINS-28335)
|
||||||
sh "git push origin ${env.BRANCH_NAME}"
|
sh "git push origin ${env.BRANCH_NAME} || { git pull --rebase origin ${env.BRANCH_NAME} && git push origin ${env.BRANCH_NAME} ; }"
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
/* Ignore, non-critical -- might not exist on this branch */
|
/* Ignore, non-critical -- might not exist on this branch */
|
||||||
echo "Failed to update docker repo"
|
echo "Failed to update docker repo"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user