Skip to content

Commit 424c571

Browse files
committed
(build) changed condition for publish tasks
1 parent 4f95a1b commit 424c571

File tree

8 files changed

+34
-35
lines changed

8 files changed

+34
-35
lines changed

.azurepipelines/publish.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ steps:
1616
CHOCOLATEY_API_URL: $(CHOCOLATEY_API_URL)
1717
RUBY_GEM_API_KEY: $(RUBY_GEM_API_KEY)
1818
ENABLED_PUBLISH_GEM: $(ENABLED_PUBLISH_GEM)
19-
ENABLED_PUBLISH_TFS: $(ENABLED_PUBLISH_TFS)
2019
ENABLED_PUBLISH_NUGET: $(ENABLED_PUBLISH_NUGET)
2120
ENABLED_PUBLISH_CHOCOLATEY: $(ENABLED_PUBLISH_CHOCOLATEY)
2221
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2

build.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#load "./build/artifacts-test.cake"
3939
#load "./build/docker-build.cake"
4040
#load "./build/publish.cake"
41-
#load "./build/wyam.cake"
41+
#load "./build/docs.cake"
4242

4343
using Xunit;
4444
using System.Diagnostics;

build/artifacts-test.cake

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
singleStageRun = !IsEnabled(Context, "ENABLED_MULTI_STAGE_BUILD", false);
22

33
Task("Artifacts-Prepare")
4-
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-Prepare can be tested only on Windows or Linux agents.")
5-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsCiSupportingDocker, "Artifacts-Prepare works only on AzurePipeline.")
4+
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-Prepare can be tested only on Windows or Linux agents.")
5+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Artifacts-Prepare works only on Releasing CI.")
66
.IsDependentOnWhen("Pack-Nuget", singleStageRun)
77
.Does<BuildParameters>((parameters) =>
88
{
99
});
1010

1111
Task("Artifacts-DotnetTool-Test")
12-
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-DotnetTool-Test can be tested only on Windows or Linux agents.")
13-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsCiSupportingDocker, "Artifacts-DotnetTool-Test works only on AzurePipeline.")
12+
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-DotnetTool-Test can be tested only on Windows or Linux agents.")
13+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Artifacts-DotnetTool-Test works only on Releasing CI.")
1414
.IsDependentOn("Artifacts-Prepare")
1515
.Does<BuildParameters>((parameters) =>
1616
{
@@ -29,8 +29,8 @@ Task("Artifacts-DotnetTool-Test")
2929
});
3030

3131
Task("Artifacts-MsBuild-Test")
32-
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-MsBuild-Test can be tested only on Windows or Linux agents.")
33-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsCiSupportingDocker, "Artifacts-MsBuild-Test works only on AzurePipeline.")
32+
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-MsBuild-Test can be tested only on Windows or Linux agents.")
33+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Artifacts-MsBuild-Test works only on Releasing CI.")
3434
.IsDependentOn("Artifacts-Prepare")
3535
.Does<BuildParameters>((parameters) =>
3636
{
@@ -50,7 +50,7 @@ Task("Artifacts-MsBuild-Test")
5050
});
5151

5252
Task("Artifacts-Test")
53-
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-Test can be tested only on Windows or Linux agents.")
54-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsCiSupportingDocker, "Artifacts-Test works only on AzurePipeline.")
53+
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Artifacts-Test can be tested only on Windows or Linux agents.")
54+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Artifacts-Test works only on Releasing CI.")
5555
.IsDependentOn("Artifacts-DotnetTool-Test")
5656
.IsDependentOn("Artifacts-MsBuild-Test");

build/docker-build.cake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
singleStageRun = !IsEnabled(Context, "ENABLED_MULTI_STAGE_BUILD", false);
22

33
Task("Docker-Build")
4-
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Docker can be built only on Windows or Linux agents.")
5-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsCiSupportingDocker, "Docker-Build works only on AzurePipeline.")
4+
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Docker can be built only on Windows or Linux agents.")
5+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Docker-Build works only on Releasing CI.")
66
.IsDependentOnWhen("Pack-Prepare", singleStageRun)
77
.Does<BuildParameters>((parameters) =>
88
{
@@ -13,8 +13,8 @@ Task("Docker-Build")
1313
});
1414

1515
Task("Docker-Test")
16-
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Docker can be tested only on Windows or Linux agents.")
17-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsCiSupportingDocker, "Docker-Test works only on AzurePipeline.")
16+
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Docker can be tested only on Windows or Linux agents.")
17+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Docker-Test works only on Releasing CI.")
1818
.IsDependentOn("Docker-Build")
1919
.Does<BuildParameters>((parameters) =>
2020
{
@@ -33,7 +33,7 @@ Task("Docker-Test")
3333
Task("Docker-Publish")
3434
.WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishDocker, "Docker-Publish was disabled.")
3535
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsRunningOnMacOS, "Docker-Publish works only on Windows and Linux agents.")
36-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsCiSupportingDocker, "Docker-Publish works only on AzurePipeline.")
36+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Docker-Publish works only on Releasing CI.")
3737
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Docker-Publish works only for releases.")
3838
.IsDependentOn("Docker-Test")
3939
.Does<BuildParameters>((parameters) =>

build/wyam.cake renamed to build/docs.cake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ Task("Force-Publish-Documentation")
5555
Task("Publish-Documentation-Internal")
5656
.IsDependentOn("Clean-Documentation")
5757
.WithCriteria(() => DirectoryExists(MakeAbsolute(Directory("docs"))), "Wyam documentation directory is missing")
58-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-Documentation is ran only on Windows agents.")
59-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Documentation is ran only on AzurePipeline.")
58+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-Documentation is ran only on Windows agents.")
59+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Publish-Documentation is ran only on Releasing CI.")
6060
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Documentation works only for non-PR commits.")
6161
.Does<BuildParameters>((parameters) =>
6262
{

build/publish.cake

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ singleStageRun = !IsEnabled(Context, "ENABLED_MULTI_STAGE_BUILD", false);
33
#region Publish
44

55
Task("Release-Notes")
6-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Release notes are generated only on Windows agents.")
7-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Release notes are generated only on AzurePipeline.")
8-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease(), "Release notes are generated only for stable releases.")
6+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Release notes are generated only on Windows agents.")
7+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Release notes are generated only on Releasing CI.")
8+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease(), "Release notes are generated only for stable releases.")
99
.Does<BuildParameters>((parameters) =>
1010
{
1111
var token = parameters.Credentials.GitHub.Token;
@@ -32,7 +32,6 @@ Task("Release-Notes")
3232
Error(exception.Dump());
3333
});
3434

35-
3635
Task("Publish-AppVeyor")
3736
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-AppVeyor works only on Windows agents.")
3837
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAppVeyor, "Publish-AppVeyor works only on AppVeyor.")
@@ -58,9 +57,9 @@ Task("Publish-AppVeyor")
5857
});
5958

6059
Task("Publish-AzurePipeline")
61-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-AzurePipeline works only on Windows agents.")
62-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-AzurePipeline works only on AzurePipeline.")
63-
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsPullRequest, "Publish-AzurePipeline works only for non-PR commits.")
60+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-AzurePipeline works only on Windows agents.")
61+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Publish-AzurePipeline works only on Releasing CI.")
62+
.WithCriteria<BuildParameters>((context, parameters) => !parameters.IsPullRequest, "Publish-AzurePipeline works only for non-PR commits.")
6463
.IsDependentOnWhen("UnitTest", singleStageRun)
6564
.IsDependentOnWhen("Pack", singleStageRun)
6665
.Does<BuildParameters>((parameters) =>
@@ -82,9 +81,9 @@ Task("Publish-AzurePipeline")
8281
});
8382

8483
Task("Publish-Gem-Internal")
85-
.WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishGem, "Publish-Gem was disabled.")
86-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-Gem works only on Windows agents.")
87-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Gem works only on AzurePipeline.")
84+
.WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishGem, "Publish-Gem was disabled.")
85+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-Gem works only on Windows agents.")
86+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Publish-Gem works only on Releasing CI.")
8887
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Gem works only for releases.")
8988
.IsDependentOnWhen("Pack-Gem", singleStageRun)
9089
.Does<BuildParameters>((parameters) =>
@@ -110,9 +109,9 @@ Task("Publish-Gem-Internal")
110109
});
111110

112111
Task("Publish-NuGet-Internal")
113-
.WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishNuget, "Publish-NuGet was disabled.")
114-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-NuGet works only on Windows agents.")
115-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-NuGet works only on AzurePipeline.")
112+
.WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishNuget, "Publish-NuGet was disabled.")
113+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-NuGet works only on Windows agents.")
114+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Publish-NuGet works only on Releasing CI.")
116115
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-NuGet works only for releases.")
117116
.IsDependentOnWhen("Pack-NuGet", singleStageRun)
118117
.Does<BuildParameters>((parameters) =>
@@ -150,7 +149,7 @@ Task("Publish-NuGet-Internal")
150149
Task("Publish-Chocolatey-Internal")
151150
.WithCriteria<BuildParameters>((context, parameters) => parameters.EnabledPublishChocolatey, "Publish-Chocolatey was disabled.")
152151
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-Chocolatey works only on Windows agents.")
153-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Chocolatey works only on AzurePipeline.")
152+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Publish-Chocolatey works only on Releasing CI.")
154153
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Chocolatey works only for releases.")
155154
.IsDependentOnWhen("Pack-Chocolatey", singleStageRun)
156155
.Does<BuildParameters>((parameters) =>

build/test.cake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ Task("UnitTest")
7878
});
7979

8080
Task("Publish-Coverage")
81-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-Coverage works only on Windows agents.")
82-
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnAzurePipeline, "Publish-Coverage works only on AzurePipeline.")
81+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsRunningOnWindows, "Publish-Coverage works only on Windows agents.")
82+
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsReleasingCI, "Publish-Coverage works only on Releasing CI.")
8383
.WithCriteria<BuildParameters>((context, parameters) => parameters.IsStableRelease() || parameters.IsPreRelease(), "Publish-Coverage works only for releases.")
8484
.IsDependentOn("UnitTest")
8585
.Does<BuildParameters>((parameters) =>

build/utils/parameters.cake

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public class BuildParameters
3636
public bool IsRunningOnAppVeyor { get; private set; }
3737
public bool IsRunningOnTravis { get; private set; }
3838
public bool IsRunningOnAzurePipeline { get; private set; }
39-
public bool IsCiSupportingDocker { get; private set; }
39+
40+
public bool IsReleasingCI { get; private set; }
4041

4142
public bool IsMainRepo { get; private set; }
4243
public bool IsMainBranch { get; private set; }
@@ -94,7 +95,7 @@ public class BuildParameters
9495
IsRunningOnTravis = buildSystem.IsRunningOnTravisCI,
9596
IsRunningOnAzurePipeline = buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted,
9697

97-
IsCiSupportingDocker = buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted,
98+
IsReleasingCI = buildSystem.IsRunningOnAzurePipelines || buildSystem.IsRunningOnAzurePipelinesHosted,
9899

99100
IsDockerForWindows = dockerCliPlatform == "windows",
100101
IsDockerForLinux = dockerCliPlatform == "linux",

0 commit comments

Comments
 (0)