From 5b061e3c60a3f2c74522324ba49ba104ac476a4d Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Fri, 22 May 2020 01:44:47 +0200 Subject: [PATCH] actually use criteria to skip push --- Jenkinsfile | 2 +- build.cake | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3f1e7c0..ff10585 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stage('Cake Build') { steps { sh 'chmod +x ./build.sh' - sh './build.sh -Target=Push -Branch=' + env.BRANCH_NAME + sh './build.sh -Target=Publish -Branch=' + env.BRANCH_NAME } } stage('Document') { diff --git a/build.cake b/build.cake index 8ff156d..b80966b 100644 --- a/build.cake +++ b/build.cake @@ -37,9 +37,7 @@ Task("Pack").IsDependentOn("Build").Does(() => { DotNetCorePack(project.FullPath, settings); }); -Task("Push").IsDependentOn("Pack").Does(() => { - if(branch != "master" && branch != "release") - return; +Task("Push").WithCriteria(branch == "master" || branch == "release").IsDependentOn("Pack").Does(() => { NuGetPushSettings settings; if (branch == "release") { settings = new NuGetPushSettings { @@ -62,5 +60,6 @@ Task("Document").Does(() => { }); Task("Default").IsDependentOn("Pack"); +Task("Publish").IsDependentOn("Push"); RunTarget(target); \ No newline at end of file