From 13f0adca91cbce26699c84ae32b466b74af66794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?= Date: Thu, 25 Aug 2016 17:11:26 +0200 Subject: [PATCH] Moved uploading artifact to appveyor.yml --- appveyor.yml | 2 ++ build.cake | 37 ------------------------------------- 2 files changed, 2 insertions(+), 37 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c7e5cec68c..d7565aa20f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -21,5 +21,7 @@ build_script: after_build: - .\packages\JetBrains.dotMemoryUnit.2.1.20150828.125449\tools\dotMemoryUnit.exe -targetExecutable="%xunit20%\xunit.console.x86.exe" -returnTargetExitCode --"tests\Avalonia.LeakTests\bin\Release\Avalonia.LeakTests.dll" test: off +artifacts: + - path: artifacts\nuget\*.nupkg cache: - gtk-sharp-2.12.26.msi diff --git a/build.cake b/build.cake index b43eabb998..156624df3b 100644 --- a/build.cake +++ b/build.cake @@ -86,8 +86,6 @@ if (isRunningOnAppVeyor) var artifactsDir = (DirectoryPath)Directory("./artifacts"); var nugetRoot = artifactsDir.Combine("nuget"); -var binRoot = artifactsDir.Combine("bin"); -var zipBinArtifacts = artifactsDir.CombineWithFilePath("Avalonia-" + version + ".zip"); var dirSuffix = configuration; var dirSuffixSkia = (isPlatformAnyCPU ? "x86" : platform) + "/" + configuration; @@ -449,12 +447,6 @@ var nugetPackages = nuspecNuGetSettings.Select(nuspec => { return nuspec.OutputDirectory.CombineWithFilePath(string.Concat(nuspec.Id, ".", nuspec.Version, ".nupkg")); }).ToArray(); -var binFiles = nuspecNuGetSettings.SelectMany(nuspec => { - return nuspec.Files.Select(file => { - return ((DirectoryPath)nuspec.BasePath).CombineWithFilePath(file.Source); - }); -}).GroupBy(f => f.FullPath).Select(g => g.First()); - /////////////////////////////////////////////////////////////////////////////// // INFORMATION /////////////////////////////////////////////////////////////////////////////// @@ -602,20 +594,6 @@ Task("Run-Unit-Tests") } }); -Task("Copy-Files") - .IsDependentOn("Run-Unit-Tests") - .Does(() => -{ - CopyFiles(binFiles, binRoot); -}); - -Task("Zip-Files") - .IsDependentOn("Copy-Files") - .Does(() => -{ - Zip(binRoot, zipBinArtifacts); -}); - Task("Create-NuGet-Packages") .IsDependentOn("Run-Unit-Tests") .Does(() => @@ -626,20 +604,6 @@ Task("Create-NuGet-Packages") } }); -Task("Upload-AppVeyor-Artifacts") - .IsDependentOn("Zip-Files") - .IsDependentOn("Create-NuGet-Packages") - .WithCriteria(() => isRunningOnAppVeyor) - .Does(() => -{ - AppVeyor.UploadArtifact(zipBinArtifacts.FullPath); - - foreach(var nupkg in nugetPackages) - { - AppVeyor.UploadArtifact(nupkg.FullPath); - } -}); - Task("Publish-MyGet") .IsDependentOn("Create-NuGet-Packages") .WithCriteria(() => !isLocalBuild) @@ -719,7 +683,6 @@ Task("Default") .IsDependentOn("Package"); Task("AppVeyor") - .IsDependentOn("Upload-AppVeyor-Artifacts") .IsDependentOn("Publish-MyGet") .IsDependentOn("Publish-NuGet");