diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0b82db88..78c5bba2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -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 diff --git a/src/Squirrel.CommandLine/OSX/CommandsOSX.cs b/src/Squirrel.CommandLine/OSX/CommandsOSX.cs index b69209fe..21785c84 100644 --- a/src/Squirrel.CommandLine/OSX/CommandsOSX.cs +++ b/src/Squirrel.CommandLine/OSX/CommandsOSX.cs @@ -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(); + var releases = new List(); 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"); }