diff --git a/Jenkinsfile b/Jenkinsfile index cc6654f..b8d3d46 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -75,6 +75,7 @@ ], inLabels: [ 'ubuntu-16', 'centos-7' ], onLabels: [ default: 'master', docker: 'docker', mac: 'mac', android: 'android', ], + cronPoll: '@hourly', // Fallback only if post-commit failed noPoll: "(.+_.+)", // Don't poll or automatically trigger private branches ) @@ -91,11 +92,11 @@ echo "This is my first task" }, ], - [ run: { echo "This is my second task" }, in: '*', on: 'docker' ], +/* [ run: { echo "This is my second task" }, in: '*', on: 'docker' ], [ run: "third.sh -v", in: [ 'ubuntu-16', 'centos-7'], on: 'docker',], [ run: [ "fourth-a.sh -v -m c", "fourth-b.sh -v -m d"], on: 'mac' ], [ run: [ "fourth-a.sh -v -m e", "fourth-b.sh -v -m f"], on: 'android' ], - ] +*/ ] } lazyStage { @@ -184,10 +185,9 @@ gitCommit("Update version to ${nextVersion}", 'version.txt') // Uncomment the following to merge version bump back into the working branch //gitMerge(releaseBranch, workingBranch) - //gitPush(remote, workingBranch) - // Publish changes in release branch and tag the release - gitPush(remote, releaseBranch) - gitTag("${nextVersion}", remote) + // Tag and publish changes in release branch + gitTag("${nextVersion}") + gitPush(remote, "${releaseBranch} ${nextVersion}") }) }, // Can not be done in parallel