Skip to content

Commit 7075110

Browse files
committed
Upload jit diffs as 7zip with more compression
1 parent ce9201d commit 7075110

2 files changed

Lines changed: 24 additions & 3 deletions

File tree

Runner/JobBase.cs

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,27 @@ public async Task ZipAndUploadArtifactAsync(string zipFileName, string folderPat
258258
File.Delete(zipFilePath);
259259
}
260260

261+
public async Task SevenZipAndUploadArtifactAsync(string archiveFileName, string folderPath, bool maxCompression = false)
262+
{
263+
if (!Live)
264+
{
265+
return;
266+
}
267+
268+
archiveFileName = $"{archiveFileName}.7z";
269+
string archiveFilePath = Path.GetFullPath(archiveFileName);
270+
271+
folderPath = Path.GetFullPath(folderPath);
272+
273+
await LogAsync($"[{archiveFileName}] Compressing {folderPath}");
274+
275+
await RunProcessAsync("7z", $"a -mx{(maxCompression ? 9 : 5)} {(maxCompression ? "-md512m" : "")} {archiveFilePath} .", logPrefix: archiveFileName, workDir: folderPath, suppressOutputLogs: true);
276+
277+
await UploadArtifactAsync(archiveFilePath);
278+
279+
File.Delete(archiveFilePath);
280+
}
281+
261282
public async Task LogAsync(string message)
262283
{
263284
message = $"[{FormatElapsedTime(ElapsedTime)}] {message}";

Runner/Jobs/JitDiffJob.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ public static async Task CloneRuntimeAndSetupToolsAsync(JobBase job)
133133
{
134134
Task cloneRuntimeTask = RuntimeHelpers.CloneRuntimeAsync(job);
135135

136-
Task setupZipAndWgetTask = job.RunProcessAsync("apt-get", "install -y zip wget ninja-build", logPrefix: "Setup zip & wget");
136+
Task setupZipAndWgetTask = job.RunProcessAsync("apt-get", "install -y zip wget p7zip-full ninja-build", logPrefix: "Setup zip & wget");
137137

138138
Task setupJitutilsTask = Task.Run(async () =>
139139
{
@@ -368,8 +368,8 @@ await Task.WhenAll(
368368
}
369369
finally
370370
{
371-
PendingTasks.Enqueue(ZipAndUploadArtifactAsync("jit-diffs-main", DiffsMainDirectory));
372-
PendingTasks.Enqueue(ZipAndUploadArtifactAsync("jit-diffs-pr", DiffsPrDirectory));
371+
PendingTasks.Enqueue(SevenZipAndUploadArtifactAsync("jit-diffs-main", DiffsMainDirectory, maxCompression: true));
372+
PendingTasks.Enqueue(SevenZipAndUploadArtifactAsync("jit-diffs-pr", DiffsPrDirectory, maxCompression: true));
373373
}
374374

375375
CombineAllDiffs(DiffsMainDirectory, CombinedDasmMainDirectory);

0 commit comments

Comments
 (0)