GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Fix Github CD hanging during editor package compression

Browse Source
This commit is contained in:
Wojtek Figat
2021-12-20 19:09:18 +01:00
parent 233de2d4a4
commit 71212420f6
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Tools/Flax.Build/Deploy/Deployment.Editor.cs
View File

@@ -1,12 +1,12 @@
// Copyright (c) 2012-2020 Flax Engine. All rights reserved. // Copyright (c) 2012-2020 Flax Engine. All rights reserved.
#define USE_STD
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using Flax.Build; using Flax.Build;
using Ionic.Zip;
using Ionic.Zlib;
namespace Flax.Deploy namespace Flax.Deploy
{ {
@@ -140,15 +140,17 @@ namespace Flax.Deploy
{ {
editorPackageZipPath = Path.Combine(Deployer.PackageOutputPath, "Editor.zip"); editorPackageZipPath = Path.Combine(Deployer.PackageOutputPath, "Editor.zip");
Utilities.FileDelete(editorPackageZipPath); Utilities.FileDelete(editorPackageZipPath);
using (ZipFile zip = new ZipFile()) #if USE_STD
System.IO.Compression.ZipFile.CreateFromDirectory(OutputPath, editorPackageZipPath, System.IO.Compression.CompressionLevel.Optimal, false);
#else
using (var zip = new Ionic.Zip.ZipFile())
{ {
zip.AddDirectory(OutputPath); zip.AddDirectory(OutputPath);
zip.CompressionLevel = Ionic.Zlib.CompressionLevel.BestCompression;
zip.CompressionLevel = CompressionLevel.BestCompression;
zip.Comment = string.Format("Flax Editor {0}.{1}.{2}\nDate: {3}", Deployer.VersionMajor, Deployer.VersionMinor, Deployer.VersionBuild, DateTime.UtcNow); zip.Comment = string.Format("Flax Editor {0}.{1}.{2}\nDate: {3}", Deployer.VersionMajor, Deployer.VersionMinor, Deployer.VersionBuild, DateTime.UtcNow);
zip.Save(editorPackageZipPath); zip.Save(editorPackageZipPath);
} }
#endif
} }
Log.Info("Compressed editor package size: " + Utilities.GetFileSize(editorPackageZipPath)); Log.Info("Compressed editor package size: " + Utilities.GetFileSize(editorPackageZipPath));
@@ -157,15 +159,17 @@ namespace Flax.Deploy
Log.Info("Compressing editor debug symbols files..."); Log.Info("Compressing editor debug symbols files...");
editorPackageZipPath = Path.Combine(Deployer.PackageOutputPath, "EditorDebugSymbols.zip"); editorPackageZipPath = Path.Combine(Deployer.PackageOutputPath, "EditorDebugSymbols.zip");
Utilities.FileDelete(editorPackageZipPath); Utilities.FileDelete(editorPackageZipPath);
using (ZipFile zip = new ZipFile()) #if USE_STD
System.IO.Compression.ZipFile.CreateFromDirectory(Path.Combine(Deployer.PackageOutputPath, "EditorDebugSymbols"), editorPackageZipPath, System.IO.Compression.CompressionLevel.Optimal, false);
#else
using (var zip = new Ionic.Zip.ZipFile())
{ {
zip.AddDirectory(Path.Combine(Deployer.PackageOutputPath, "EditorDebugSymbols")); zip.AddDirectory(Path.Combine(Deployer.PackageOutputPath, "EditorDebugSymbols"));
zip.CompressionLevel = Ionic.Zlib.CompressionLevel.BestCompression;
zip.CompressionLevel = CompressionLevel.BestCompression;
zip.Comment = string.Format("Flax Editor {0}.{1}.{2}\nDate: {3}", Deployer.VersionMajor, Deployer.VersionMinor, Deployer.VersionBuild, DateTime.UtcNow); zip.Comment = string.Format("Flax Editor {0}.{1}.{2}\nDate: {3}", Deployer.VersionMajor, Deployer.VersionMinor, Deployer.VersionBuild, DateTime.UtcNow);
zip.Save(editorPackageZipPath); zip.Save(editorPackageZipPath);
} }
#endif
Log.Info("Compressed editor debug symbols package size: " + Utilities.GetFileSize(editorPackageZipPath)); Log.Info("Compressed editor debug symbols package size: " + Utilities.GetFileSize(editorPackageZipPath));
} }