From ddb6bb00a9c7de624e5c2c4b3520637a1a86b0b6 Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Wed, 28 May 2025 13:08:53 +0200 Subject: [PATCH 1/2] fix missing -z flag on tar when unpacking on non windows platforms --- .../Tasks/IClusterComposeTask.cs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs b/src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs index 536c22d..674691e 100644 --- a/src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs +++ b/src/Elastic.Elasticsearch.Ephemeral/Tasks/IClusterComposeTask.cs @@ -227,21 +227,23 @@ protected static void Extract(string file, string toFolder) private static void ExtractTar(string file, string toFolder) { - using (var inStream = File.OpenRead(file)) - using (var tarArchive = TarArchive.CreateInputTarArchive(inStream)) - tarArchive.ExtractContents(toFolder); + using var inStream = File.OpenRead(file); + using var tarArchive = TarArchive.CreateInputTarArchive(inStream); + tarArchive.ExtractContents(toFolder); } private static void ExtractTarGz(string file, string toFolder) { if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) - using (var inStream = File.OpenRead(file)) - using (var gzipStream = new GZipInputStream(inStream)) - using (var tarArchive = TarArchive.CreateInputTarArchive(gzipStream)) - tarArchive.ExtractContents(toFolder); + { + using var inStream = File.OpenRead(file); + using var gzipStream = new GZipInputStream(inStream); + using var tarArchive = TarArchive.CreateInputTarArchive(gzipStream); + tarArchive.ExtractContents(toFolder); + } else //SharpZipLib loses permissions when untarring - Proc.Exec("tar", "-xvf", file, "-C", toFolder); + Proc.Exec("tar", "-zxvf", file, "-C", toFolder); } private static void ExtractZip(string file, string toFolder) => From 635546cb16bd35d662f70869c0c9776a0dd0357c Mon Sep 17 00:00:00 2001 From: Martijn Laarman Date: Wed, 28 May 2025 13:11:04 +0200 Subject: [PATCH 2/2] add .NET 6.x to install on ci --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 510378f..39c276e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,6 +30,8 @@ jobs: - uses: actions/setup-dotnet@v3 with: global-json-file: global.json + dotnet-version: | + 6.x env: NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}