Add delta packages to RELEASES in osx builds

This commit is contained in:
Caelan Sayler
2022-05-24 13:08:49 +01:00
parent 0fde19bd8e
commit 488faff0cd
2 changed files with 10 additions and 9 deletions

View File

@@ -82,7 +82,6 @@ jobs:
if: ${{ always() }}
run: security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
- name: Fix Packages
shell: bash
run: |
export NUGET_VERSION=$(./nbgv get-version -f json | python3 -c "import sys, json; print(json.load(sys.stdin)['NuGetPackageVersion'])")
echo $NUGET_VERSION

View File

@@ -36,9 +36,9 @@ namespace Squirrel.CommandLine.OSX
var nupkgPath = NugetConsole.CreatePackageFromNuspecPath(tmp, options.package, manifest.FilePath);
var releaseFilePath = Path.Combine(releasesDir.FullName, "RELEASES");
var previousReleases = new List<ReleaseEntry>();
var releases = new List<ReleaseEntry>();
if (File.Exists(releaseFilePath)) {
previousReleases.AddRange(ReleaseEntry.ParseReleaseFile(File.ReadAllText(releaseFilePath, Encoding.UTF8)));
releases.AddRange(ReleaseEntry.ParseReleaseFile(File.ReadAllText(releaseFilePath, Encoding.UTF8)));
}
Log.Info("Creating Squirrel Release");
@@ -46,15 +46,17 @@ namespace Squirrel.CommandLine.OSX
var newPkgPath = rp.CreateReleasePackage(Path.Combine(releasesDir.FullName, rp.SuggestedReleaseFileName));
Log.Info("Creating Delta Packages");
var prev = ReleasePackageBuilder.GetPreviousRelease(previousReleases, rp, releasesDir.FullName);
var prev = ReleasePackageBuilder.GetPreviousRelease(releases, rp, releasesDir.FullName);
if (prev != null && !options.noDelta) {
var deltaBuilder = new DeltaPackageBuilder();
var dp = deltaBuilder.CreateDeltaPackage(prev, rp,
Path.Combine(releasesDir.FullName, rp.SuggestedReleaseFileName.Replace("full", "delta")));
var deltaFile = Path.Combine(releasesDir.FullName, rp.SuggestedReleaseFileName.Replace("full", "delta"));
var dp = deltaBuilder.CreateDeltaPackage(prev, rp, deltaFile);
releases.Add(ReleaseEntry.GenerateFromFile(deltaFile));
}
ReleaseEntry.WriteReleaseFile(previousReleases.Concat(new[] { ReleaseEntry.GenerateFromFile(newPkgPath) }), releaseFilePath);
EasyZip.CreateZipFromDirectory(Path.Combine(releasesDir.FullName, $"{rp.Id}.app.zip"), options.package, nestDirectory: true);
releases.Add(ReleaseEntry.GenerateFromFile(newPkgPath));
ReleaseEntry.WriteReleaseFile(releases, releaseFilePath);
// EasyZip.CreateZipFromDirectory(Path.Combine(releasesDir.FullName, $"{rp.Id}.app.zip"), options.package, nestDirectory: true);
Log.Info("Done");
}