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}} 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) =>