Skip to content

Commit dd52b03

Browse files
Merge pull request #767 from WildGums/GitHubSync/20250212-120119
GitHubSync update
2 parents a4b7b23 + 80c0a43 commit dd52b03

7 files changed

+2
-356
lines changed

deployment/cake/apps-web-tasks.cake

-207
This file was deleted.

deployment/cake/apps-web-variables.cake

-49
This file was deleted.

deployment/cake/docker-tasks.cake

+1-42
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#l "docker-variables.cake"
2-
#l "lib-octopusdeploy.cake"
32

43
#addin "nuget:?package=Cake.Docker&version=1.3.0"
54

@@ -311,9 +310,6 @@ public class DockerImagesProcessor : ProcessorBase
311310
var dockerRegistryUserName = GetDockerRegistryUserName(dockerImage);
312311
var dockerRegistryPassword = GetDockerRegistryPassword(dockerImage);
313312
var dockerImageName = GetDockerImageName(dockerImage);
314-
var octopusRepositoryUrl = BuildContext.OctopusDeploy.GetRepositoryUrl(dockerImage);
315-
var octopusRepositoryApiKey = BuildContext.OctopusDeploy.GetRepositoryApiKey(dockerImage);
316-
var octopusDeploymentTarget = BuildContext.OctopusDeploy.GetDeploymentTarget(dockerImage);
317313

318314
if (string.IsNullOrWhiteSpace(dockerRegistryUrl))
319315
{
@@ -347,44 +343,7 @@ public class DockerImagesProcessor : ProcessorBase
347343

348344
CakeContext.DockerPush(dockerImagePushSettings, dockerImageTag);
349345

350-
if (string.IsNullOrWhiteSpace(octopusRepositoryUrl))
351-
{
352-
CakeContext.Warning("Octopus Deploy url is not specified, skipping deployment to Octopus Deploy");
353-
continue;
354-
}
355-
356-
var imageVersion = BuildContext.General.Version.NuGet;
357-
358-
CakeContext.Information("Creating release '{0}' in Octopus Deploy", imageVersion);
359-
360-
CakeContext.OctoCreateRelease(dockerImage, new CreateReleaseSettings
361-
{
362-
Server = octopusRepositoryUrl,
363-
ApiKey = octopusRepositoryApiKey,
364-
ReleaseNumber = imageVersion,
365-
DefaultPackageVersion = imageVersion,
366-
IgnoreExisting = true,
367-
Packages = new Dictionary<string, string>
368-
{
369-
{ dockerImageName, imageVersion }
370-
}
371-
});
372-
373-
CakeContext.Information("Deploying release '{0}' via Octopus Deploy", imageVersion);
374-
375-
CakeContext.OctoDeployRelease(octopusRepositoryUrl, octopusRepositoryApiKey, dockerImage, octopusDeploymentTarget,
376-
imageVersion, new OctopusDeployReleaseDeploymentSettings
377-
{
378-
ShowProgress = true,
379-
WaitForDeployment = true,
380-
DeploymentTimeout = TimeSpan.FromMinutes(5),
381-
CancelOnTimeout = true,
382-
GuidedFailure = true,
383-
Force = true,
384-
NoRawLog = true,
385-
});
386-
387-
await BuildContext.Notifications.NotifyAsync(dockerImage, string.Format("Deployed to Octopus Deploy"), TargetType.DockerImage);
346+
await BuildContext.Notifications.NotifyAsync(dockerImage, string.Format("Deployed to Docker"), TargetType.DockerImage);
388347
}
389348
}
390349
finally

deployment/cake/lib-generic.cake

-8
Original file line numberDiff line numberDiff line change
@@ -200,8 +200,6 @@ public enum TargetType
200200

201201
VsExtension,
202202

203-
WebApp,
204-
205203
WpfApp
206204
}
207205

@@ -847,12 +845,6 @@ private static bool IsOnlyDependencyProject(BuildContext buildContext, string pr
847845
return false;
848846
}
849847

850-
if (buildContext.Web.Items.Contains(projectName))
851-
{
852-
buildContext.CakeContext.Information($"Project is list of web apps, assuming not dependency only");
853-
return false;
854-
}
855-
856848
if (buildContext.Wpf.Items.Contains(projectName))
857849
{
858850
buildContext.CakeContext.Information($"Project is list of WPF apps, assuming not dependency only");

deployment/cake/lib-msbuild.cake

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#addin "nuget:?package=Cake.Issues&version=5.5.0"
22
#addin "nuget:?package=Cake.Issues.MsBuild&version=5.5.0"
3-
#addin "nuget:?package=System.Configuration.ConfigurationManager&version=9.0.1"
3+
#addin "nuget:?package=System.Configuration.ConfigurationManager&version=9.0.2"
44

55
#tool "nuget:?package=MSBuild.Extension.Pack&version=1.9.1"
66

deployment/cake/lib-octopusdeploy.cake

-40
This file was deleted.

0 commit comments

Comments
 (0)