Skip to content

Commit 24f1987

Browse files
committed
(build) changes in task dependencies
1 parent 443fefe commit 24f1987

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

build.cake

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ using System.Diagnostics;
3939
// PARAMETERS
4040
//////////////////////////////////////////////////////////////////////
4141
bool publishingError = false;
42-
bool singleStageRun = false;
42+
bool singleStageRun = true;
4343
///////////////////////////////////////////////////////////////////////////////
4444
// SETUP / TEARDOWN
4545
///////////////////////////////////////////////////////////////////////////////
@@ -51,8 +51,6 @@ Setup<BuildParameters>(context =>
5151
var gitVersion = GetVersion(parameters);
5252
parameters.Initialize(context, gitVersion);
5353

54-
singleStageRun = !parameters.EnabledMultiStageBuild;
55-
5654
// Increase verbosity?
5755
if (parameters.IsMainBranch && (context.Log.Verbosity != Verbosity.Diagnostic)) {
5856
Information("Increasing verbosity to diagnostic.");

build/docker.cake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
singleStageRun = !IsEnabled(Context, "ENABLED_MULTI_STAGE_BUILD", false);
2+
13
Task("Docker-Build")
24
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Docker can be built only on Windows or Linux agents.")
35
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Docker-Build works only on AzurePipeline.")
4-
.IsDependentOnWhen("Copy-Files", singleStageRun)
6+
.IsDependentOnWhen("Pack-Gem", singleStageRun)
57
.Does<BuildParameters>((parameters) =>
68
{
79
foreach(var dockerImage in parameters.Docker.Images)

build/publish.cake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
singleStageRun = !IsEnabled(Context, "ENABLED_MULTI_STAGE_BUILD", false);
2+
13
#region Publish
24

35
Task("Release-Notes")

build/utils/parameters.cake

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ public class BuildParameters
1717
public bool EnabledPublishNuget { get; private set; }
1818
public bool EnabledPublishChocolatey { get; private set; }
1919
public bool EnabledPublishDocker { get; private set; }
20-
public bool EnabledMultiStageBuild { get; private set; }
2120

2221
public bool IsRunningOnUnix { get; private set; }
2322
public bool IsRunningOnWindows { get; private set; }
@@ -76,7 +75,6 @@ public class BuildParameters
7675
EnabledPublishNuget = IsEnabled(context, "ENABLED_PUBLISH_NUGET"),
7776
EnabledPublishChocolatey = IsEnabled(context, "ENABLED_PUBLISH_CHOCOLATEY"),
7877
EnabledPublishDocker = IsEnabled(context, "ENABLED_PUBLISH_DOCKER"),
79-
EnabledMultiStageBuild = IsEnabled(context, "ENABLED_MULTI_STAGE_BUILD", false),
8078

8179
IsRunningOnUnix = context.IsRunningOnUnix(),
8280
IsRunningOnWindows = context.IsRunningOnWindows(),
@@ -218,11 +216,4 @@ public class BuildParameters
218216

219217
return redirectedOutput.Any();
220218
}
221-
222-
private static bool IsEnabled(ICakeContext context, string envVar, bool nullOrEmptyAsEnabled = true)
223-
{
224-
var value = context.EnvironmentVariable(envVar);
225-
226-
return string.IsNullOrWhiteSpace(value) ? nullOrEmptyAsEnabled : bool.Parse(value);
227-
}
228219
}

build/utils/utils.cake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,3 +168,10 @@ public static CakeTaskBuilder IsDependentOnWhen(this CakeTaskBuilder builder, st
168168
}
169169
return builder;
170170
}
171+
172+
public static bool IsEnabled(ICakeContext context, string envVar, bool nullOrEmptyAsEnabled = true)
173+
{
174+
var value = context.EnvironmentVariable(envVar);
175+
176+
return string.IsNullOrWhiteSpace(value) ? nullOrEmptyAsEnabled : bool.Parse(value);
177+
}

0 commit comments

Comments
 (0)