Skip to content

Commit

Permalink
Automatically merge omlib-staging branch on success
Browse files Browse the repository at this point in the history
  • Loading branch information
sjoelund committed Feb 5, 2020
1 parent 6f76e4f commit f65654b
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions Jenkinsfile
Expand Up @@ -635,6 +635,23 @@ pipeline {
}
}
}
stage('push-to-master') {
agent {
label 'linux'
}
when {
beforeAgent true
branch 'omlib-staging'
}
steps {
githubNotify status: 'SUCCESS', description: 'The staged library changes are working', context: 'continuous-integration/jenkins/pr-merge'
githubNotify status: 'SUCCESS', description: 'Skipping CLA checks on omlib-staging', context: 'license/CLA'
sshagent (credentials: ['Hudson-SSH-Key']) {
sh 'ssh-keyscan github.com >> ~/.ssh/known_hosts'
sh 'git push git@github.com:OpenModelica/OpenModelica.git omlib-staging:master || (echo "Trying to update the repository if that is the problem" ; git pull --rebase && git push --force git@github.com:OpenModelica/OpenModelica.git omlib-staging:omlib-staging & false)'
}
}
}
}
post {
failure {
Expand Down

0 comments on commit f65654b

Please sign in to comment.