Skip to content

Commit

Permalink
Separate out CI from local package build (dnnsoftware#3476)
Browse files Browse the repository at this point in the history
* The default build shouldn't build the nuget packages

* Move checksum calculation to CI

* Add documentation lines to top of Cake files

* Add manifest tuning back to CI
  • Loading branch information
donker authored and valadas committed Jan 15, 2020
1 parent 8f41e93 commit 6a75408
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 4 deletions.
4 changes: 4 additions & 0 deletions Build/Cake/ci.cake
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
// This is the task CI will use to build release packages

Task("BuildAll")
.IsDependentOn("CleanArtifacts")
.IsDependentOn("UpdateDnnManifests")
.IsDependentOn("GenerateChecksum")
.IsDependentOn("SetPackageVersions")
.IsDependentOn("CreateInstall")
.IsDependentOn("CreateUpgrade")
.IsDependentOn("CreateDeploy")
Expand Down
3 changes: 2 additions & 1 deletion Build/Cake/compiling.cake
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// Main solution
// This tasks kicks off MS Build (just as in Visual Studio)

var dnnSolutionPath = "./DNN_Platform.sln";

Task("Build")
Expand Down
2 changes: 2 additions & 0 deletions Build/Cake/database.cake
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// Database tasks for your local DNN development site

Task("ResetDatabase")
.Does(() =>
{
Expand Down
3 changes: 3 additions & 0 deletions Build/Cake/devsite.cake
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// Tasks to help you create and maintain a local DNN development site.
// Note these tasks depend on the correct settings in your settings file.

Task("ResetDevSite")
.IsDependentOn("ResetDatabase")
.IsDependentOn("PreparePackaging")
Expand Down
2 changes: 2 additions & 0 deletions Build/Cake/packaging.cake
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// The tasks create the various DNN release packages (Install, Upgrade, Deploy and Symbols)

using Dnn.CakeUtils;

public class PackagingPatterns {
Expand Down
3 changes: 3 additions & 0 deletions Build/Cake/settings.cake
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// This file loads or creates the local settings file you can use to influence the build process
// and/or maintain a local DNN development site

public class LocalSettings {
public string WebsitePath {get; set;} = "";
public string WebsiteUrl {get; set;} = "";
Expand Down
4 changes: 2 additions & 2 deletions Build/Cake/version.cake
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// These tasks are meant for our CI build process. They set the versions of the assemblies and manifests to the version found on Github.
// These tasks will set the right version for manifests and assemblies. Note you can
// control this by using custom settings

GitVersion version;
var buildId = EnvironmentVariable("BUILD_BUILDID") ?? "0";
Expand Down Expand Up @@ -53,7 +54,6 @@ Task("SetVersion")

Task("UpdateDnnManifests")
.IsDependentOn("SetVersion")
.IsDependentOn("GenerateChecksum")
.IsDependentOn("SetPackageVersions")
.DoesForEach(GetFilesByPatterns(".", new string[] {"**/*.dnn"}, unversionedManifests), (file) =>
{
Expand Down
9 changes: 8 additions & 1 deletion build.cake
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// Main Cake Build entry points. Note most Cake scripts are located under Build/Cake.

#addin nuget:?package=Cake.XdtTransform&version=0.18.1&loaddependencies=true
#addin nuget:?package=Cake.FileHelpers&version=3.2.0
#addin nuget:?package=Cake.Powershell&version=0.4.8
Expand Down Expand Up @@ -98,7 +100,12 @@ Task("CleanArtifacts")
//////////////////////////////////////////////////////////////////////

Task("Default")
.IsDependentOn("BuildAll");
.IsDependentOn("CleanArtifacts")
.IsDependentOn("UpdateDnnManifests")
.IsDependentOn("CreateInstall")
.IsDependentOn("CreateUpgrade")
.IsDependentOn("CreateDeploy")
.IsDependentOn("CreateSymbols");

//////////////////////////////////////////////////////////////////////
// EXECUTION
Expand Down

0 comments on commit 6a75408

Please sign in to comment.