Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make buildassets relative path and finish new publish logic

Browse Source
This commit is contained in:
Caelan Sayler
2024-12-23 14:29:08 +00:00
committed by Caelan
parent 5c8c066217
commit 0fba844267
6 changed files with 89 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vpk/Velopack.Deployment/GitHubRepository.cs
View File

@@ -61,7 +61,7 @@ public class GitHubRepository(ILogger logger) : SourceRepository<GitHubDownloadO
var semVer = options.TagName ?? latest.Version.ToString();
var releaseName = string.IsNullOrWhiteSpace(options.ReleaseName) ? semVer.ToString() : options.ReleaseName;
Log.Info($"Preparing to upload {build.Files.Count} asset(s) to GitHub");
Log.Info($"Preparing to upload {build.RelativeFileNames.Count} asset(s) to GitHub");
var client = new GitHubClient(new ProductHeaderValue("Velopack")) {
Credentials = new Credentials(options.Token)
@@ -111,7 +111,7 @@ public class GitHubRepository(ILogger logger) : SourceRepository<GitHubDownloadO
}
// upload all assets (incl packages)
foreach (var a in build.Files) {
foreach (var a in build.GetFilePaths()) {
await RetryAsync(() => UploadFileAsAsset(client, release, a), $"Uploading asset '{Path.GetFileName(a)}'..");
}

4
src/vpk/Velopack.Deployment/GiteaRepository.cs
View File

@@ -82,7 +82,7 @@ public class GiteaRepository : SourceRepository<GiteaDownloadOptions, GiteaSourc
config.BasePath = baseUri + "/api/v1";
config.Timeout = (int)TimeSpan.FromMinutes(options.Timeout).TotalMilliseconds;
Log.Info($"Preparing to upload {build.Files.Count} asset(s) to Gitea");
Log.Info($"Preparing to upload {build.RelativeFileNames.Count} asset(s) to Gitea");
// Set token if provided
if (!string.IsNullOrWhiteSpace(options.Token)) {
@@ -142,7 +142,7 @@ public class GiteaRepository : SourceRepository<GiteaDownloadOptions, GiteaSourc
}
// upload all assets (incl packages)
foreach (var a in build.Files) {
foreach (var a in build.GetFilePaths()) {
await RetryAsync(() => UploadFileAsAsset(apiInstance, release, repoOwner, repoName, a), $"Uploading asset '{Path.GetFileName(a)}'..");
}

7
src/vpk/Velopack.Deployment/_ObjectRepository.cs
View File

@@ -51,12 +51,11 @@ public abstract class ObjectRepository<TDown, TUp, TClient> : DownRepository<TDo
{
var build = BuildAssets.Read(options.ReleaseDir.FullName, options.Channel);
var client = CreateClient(options);
var releasesFilename = Path.GetFileName(options.ReleaseDir.FullName);
Log.Info($"Preparing to upload {build.Files.Count} local asset(s).");
Log.Info($"Preparing to upload {build.RelativeFileNames.Count} local asset(s).");
var remoteReleases = await GetReleasesAsync(options);
Log.Info($"There are {remoteReleases.Assets.Length} asset(s) in remote releases file '{releasesFilename}'.");
Log.Info($"There are {remoteReleases.Assets.Length} asset(s) in remote releases file.");
var localEntries = build.GetReleaseEntries();
var releaseEntries = ReleaseEntryHelper.MergeAssets(localEntries, remoteReleases.Assets).ToArray();
@@ -82,7 +81,7 @@ public abstract class ObjectRepository<TDown, TUp, TClient> : DownRepository<TDo
}
}
foreach (var asset in build.Files) {
foreach (var asset in build.GetFilePaths()) {
await UploadObject(client, Path.GetFileName(asset), new FileInfo(asset), true, noCache: false);
}

34
src/vpk/Velopack.Packaging/BuildAssets.cs
View File

@@ -1,22 +1,40 @@
using Velopack.Packaging.Exceptions;
using Newtonsoft.Json;
using Velopack.Packaging.Exceptions;
using Velopack.Util;
namespace Velopack.Packaging;
public class BuildAssets
{
public List<string> Files { get; set; } = new List<string>();
[JsonIgnore]
private string _outputDir;
public List<string> RelativeFileNames { get; set; } = new List<string>();
public List<VelopackAsset> GetReleaseEntries()
{
return Files.Where(x => x.EndsWith(".nupkg"))
return GetFilePaths().Where(x => x.EndsWith(".nupkg", StringComparison.OrdinalIgnoreCase))
.Select(f => VelopackAsset.FromNupkg(f))
.ToList();
}
public List<string> GetNonReleaseAssetPaths()
{
return GetFilePaths().Where(x => !x.EndsWith(".nupkg", StringComparison.OrdinalIgnoreCase))
.ToList();
}
public List<string> GetFilePaths()
{
return RelativeFileNames.Select(f => Path.GetFullPath(Path.Combine(_outputDir, f))).ToList();
}
public static void Write(string outputDir, string channel, IEnumerable<string> files)
{
var assets = new BuildAssets {
Files = files.OrderBy(f => f).ToList(),
RelativeFileNames = files.OrderBy(f => f)
.Select(f => PathUtil.MakePathRelativeTo(outputDir, f))
.ToList(),
};
var path = Path.Combine(outputDir, $"assets.{channel}.json");
var json = SimpleJson.SerializeObject(assets);
@@ -27,9 +45,13 @@ public class BuildAssets
{
var path = Path.Combine(outputDir, $"assets.{channel}.json");
if (!File.Exists(path)) {
throw new UserInfoException($"Could not find assets file for channel '{channel}' (looking for '{Path.GetFileName(path)}' in directory '{outputDir}'). " +
throw new UserInfoException(
$"Could not find assets file for channel '{channel}' (looking for '{Path.GetFileName(path)}' in directory '{outputDir}'). " +
$"If you've just created a Velopack release, verify you're calling this command with the same '--channel' as you did with 'pack'.");
}
return SimpleJson.DeserializeObject<BuildAssets>(File.ReadAllText(path));
var assets = SimpleJson.DeserializeObject<BuildAssets>(File.ReadAllText(path));
assets._outputDir = outputDir;
return assets;
}
}

7
src/vpk/Velopack.Packaging/Flow/ReleaseGroup.cs
View File

@@ -6,8 +6,15 @@ using System.Net.Http;
#nullable enable
namespace Velopack.Packaging.Flow;
internal sealed class FileUpload
{
public string? Status { get; set; }
public string? Md5Hash { get; set; }
}
internal sealed class ReleaseGroup
{
public Guid Id { get; set; }
public string? Version { get; set; }
public List<FileUpload>? FileUploads { get; set; }
}

123
src/vpk/Velopack.Packaging/Flow/VelopackFlowServiceClient.cs
View File

@@ -11,7 +11,6 @@ using Velopack.Util;
#if NET6_0_OR_GREATER
using System.Net.Http.Json;
#else
using System.Net.Http;
#endif
@@ -43,7 +42,7 @@ public class VelopackFlowServiceClient(
{
private static readonly string[] Scopes = ["openid", "offline_access"];
private AuthenticationHeaderValue Authorization = null;
private AuthenticationHeaderValue? Authorization = null;
private AuthConfiguration? AuthConfiguration { get; set; }
@@ -173,47 +172,28 @@ public class VelopackFlowServiceClient(
AssertAuthenticated();
channel ??= ReleaseEntryHelper.GetDefaultChannel(os);
ReleaseEntryHelper helper = new(releaseDirectory, channel, Logger, os);
var latestAssets = helper.GetLatestAssets().Where(f => f.Type != VelopackAssetType.Delta).ToList();
BuildAssets assets = BuildAssets.Read(releaseDirectory, channel);
var fullAsset = assets.GetReleaseEntries().SingleOrDefault(a => a.Type == VelopackAssetType.Full);
List<string> installers = [];
List<string> files = latestAssets.Select(x => x.FileName).ToList();
string? packageId = null;
SemanticVersion? version = null;
if (latestAssets.Count > 0) {
packageId = latestAssets[0].PackageId;
version = latestAssets[0].Version;
if (VelopackRuntimeInfo.IsWindows || VelopackRuntimeInfo.IsOSX) {
var setupName = ReleaseEntryHelper.GetSuggestedSetupName(packageId, channel, os);
if (File.Exists(Path.Combine(releaseDirectory, setupName))) {
installers.Add(setupName);
}
}
var portableName = ReleaseEntryHelper.GetSuggestedPortableName(packageId, channel, os);
if (File.Exists(Path.Combine(releaseDirectory, portableName))) {
installers.Add(portableName);
}
}
if (packageId is null) {
Logger.LogError("No package ID found in release directory {ReleaseDirectory}", releaseDirectory);
if (fullAsset is null) {
Logger.LogError("No full asset found in release directory {ReleaseDirectory} (or it's missing from assets file)", releaseDirectory);
return;
}
if (version is null) {
Logger.LogError("No version found in release directory {ReleaseDirectory}", releaseDirectory);
return;
}
var fullAssetPath = Path.Combine(releaseDirectory, fullAsset.FileName);
var packageId = fullAsset.PackageId;
var version = fullAsset.Version;
Logger.LogInformation("Uploading {AssetCount} assets to Velopack Flow ({ServiceUrl})", latestAssets.Count + installers.Count, serviceUrl);
var filesToUpload = assets.GetNonReleaseAssetPaths().Select(p => (p, FileType.Installer))
.Concat([(fullAssetPath, FileType.Release)])
.ToArray();
Logger.LogInformation("Beginning upload to Velopack Flow (serviceUrl={ServiceUrl})", serviceUrl);
await Console.ExecuteProgressAsync(
async (progress) => {
ReleaseGroup releaseGroup = await progress.RunTask(
"Preparing to upload assets",
$"Creating release {version}",
async (report) => {
report(-1);
var result = await CreateReleaseGroupAsync(packageId, version, channel, serviceUrl, cancellationToken);
@@ -222,19 +202,19 @@ public class VelopackFlowServiceClient(
});
var backgroundTasks = new List<Task>();
foreach (var assetFileName in files) {
foreach (var assetTuple in filesToUpload) {
backgroundTasks.Add(
progress.RunTask(
$"Uploading {Path.GetFileName(assetFileName)}",
$"Uploading {Path.GetFileName(assetTuple.Item1)}",
async (report) => {
await UploadReleaseAssetAsync(
releaseDirectory,
assetFileName,
assetTuple.Item1,
serviceUrl,
releaseGroup.Id,
FileType.Release,
assetTuple.Item2,
report,
cancellationToken);
report(100);
})
);
}
@@ -249,7 +229,7 @@ public class VelopackFlowServiceClient(
return new ZipPackage(prevVersion);
});
if (prevZip.Version >= version) {
if (prevZip.Version! >= version) {
throw new InvalidOperationException(
$"Latest version in channel {channel} is greater than or equal to local (remote={prevZip.Version}, local={version})");
}
@@ -262,8 +242,9 @@ public class VelopackFlowServiceClient(
(report) => {
var delta = new DeltaPackageBuilder(Logger);
var pOld = new ReleasePackage(prevVersion);
var pNew = new ReleasePackage(releaseDirectory);
var pNew = new ReleasePackage(fullAssetPath);
delta.CreateDeltaPackage(pOld, pNew, deltaPath, DeltaMode.BestSpeed, report);
report(100);
return Task.CompletedTask;
});
@@ -272,13 +253,13 @@ public class VelopackFlowServiceClient(
$"Uploading {Path.GetFileName(deltaPath)}",
async (report) => {
await UploadReleaseAssetAsync(
releaseDirectory,
deltaPath,
serviceUrl,
releaseGroup.Id,
FileType.Release,
report,
cancellationToken);
report(100);
})
);
@@ -295,40 +276,21 @@ public class VelopackFlowServiceClient(
if (!noWaitForLive) {
await progress.RunTask(
"Waiting for release to be live",
"Waiting for release to go live",
async (report) => {
report(-1);
await WaitUntilReleaseGroupLive(publishedGroup.Id, serviceUrl, cancellationToken);
report(100);
});
}
});
// ReleaseGroup releaseGroup = await CreateReleaseGroupAsync(packageId, version, channel, serviceUrl, cancellationToken);
//
// foreach (var assetFileName in files) {
// await UploadReleaseAssetAsync(releaseDirectory, assetFileName, serviceUrl, releaseGroup.Id, FileType.Release, cancellationToken)
// .ConfigureAwait(false);
//
// Logger.LogInformation("Uploaded {FileName} to Velopack Flow", assetFileName);
// }
//
// foreach (var installerFile in installers) {
// await UploadReleaseAssetAsync(releaseDirectory, installerFile, serviceUrl, releaseGroup.Id, FileType.Installer, cancellationToken)
// .ConfigureAwait(false);
//
// Logger.LogInformation("Uploaded {FileName} installer to Velopack Flow", installerFile);
// }
//
// await PublishReleaseGroupAsync(releaseGroup, serviceUrl, cancellationToken);
// TODO wait for published
}
private async Task DownloadLatestRelease(string packageId, string channel, string? velopackBaseUrl, string localPath,
Action<int> progress, CancellationToken cancellationToken)
{
var client = GetHttpClient(progress);
var endpoint = GetEndpoint($"v1/download/{packageId}/{channel}", velopackBaseUrl);
var endpoint = GetEndpoint($"v1/download/{packageId}/{channel}", velopackBaseUrl) + $"?assetType=Full";
using var fs = File.Create(localPath);
@@ -342,19 +304,29 @@ public class VelopackFlowServiceClient(
#endif
}
private async Task WaitUntilReleaseGroupLive(Guid releaseGroupId, string? velopackBaseUrl, CancellationToken cancellationToken)
{
var client = GetHttpClient();
var endpoint = GetEndpoint($"v1/releaseGroups/{releaseGroupId}", velopackBaseUrl);
for (int i = 0; i < 120; i++) {
for (int i = 0; i < 300; i++) {
var response = await client.GetAsync(endpoint, cancellationToken);
response.EnsureSuccessStatusCode();
var content = await response.Content.ReadAsStringAsync(cancellationToken);
Console.WriteLine(content);
var releaseGroup = await response.Content.ReadFromJsonAsync<ReleaseGroup>(cancellationToken: cancellationToken);
if (releaseGroup?.FileUploads == null) {
Logger.LogWarning("Failed to get release group status, it may not be live yet.");
return;
}
if (releaseGroup.FileUploads.All(f => f.Status?.ToLower().Equals("processed") == true)) {
Logger.LogInformation("Release is now live.");
return;
}
await Task.Delay(1000, cancellationToken);
}
Logger.LogWarning("Release did not go live within 5 minutes (timeout).");
}
private async Task<ReleaseGroup> CreateReleaseGroupAsync(
@@ -382,20 +354,17 @@ public class VelopackFlowServiceClient(
?? throw new InvalidOperationException($"Failed to create release group with version {version.ToNormalizedString()}");
}
private async Task UploadReleaseAssetAsync(string releaseDirectory, string fileName, string? velopackBaseUrl, Guid releaseGroupId,
private async Task UploadReleaseAssetAsync(string filePath, string? velopackBaseUrl, Guid releaseGroupId,
FileType fileType, Action<int> progress, CancellationToken cancellationToken)
{
using var formData = new MultipartFormDataContent {
{ new StringContent(releaseGroupId.ToString()), "ReleaseGroupId" },
{ new StringContent(fileType.ToString()), "FileType" }
};
using var formData = new MultipartFormDataContent();
formData.Add(new StringContent(releaseGroupId.ToString()), "ReleaseGroupId");
formData.Add(new StringContent(fileType.ToString()), "FileType");
var latestPath = Path.Combine(releaseDirectory, fileName);
using var fileStream = File.OpenRead(latestPath);
using var fileStream = File.OpenRead(filePath);
using var fileContent = new StreamContent(fileStream);
formData.Add(fileContent, "File", fileName);
formData.Add(fileContent, "File", Path.GetFileName(filePath));
var endpoint = GetEndpoint("v1/releases/upload", velopackBaseUrl);