From c5604900a35feec34a47ec0cb13dbb666da7dcc4 Mon Sep 17 00:00:00 2001 From: Christian Huitema Date: Wed, 6 Mar 2024 12:41:27 -0800 Subject: [PATCH] Install xz and call xzcat for load --- .github/workflows/ci-tests-clang.yml | 4 ++++ .github/workflows/ci-tests-macos.yml | 4 ++++ .github/workflows/ci-tests-privacy.yml | 4 ++++ .github/workflows/ci-tests.yml | 4 ++++ lib/ithiutil.cpp | 2 +- 5 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-tests-clang.yml b/.github/workflows/ci-tests-clang.yml index e7149513..6a4cbd2a 100644 --- a/.github/workflows/ci-tests-clang.yml +++ b/.github/workflows/ci-tests-clang.yml @@ -25,6 +25,10 @@ jobs: # a pull request then we can checkout the head. fetch-depth: 2 submodules: 'recursive' + + - name: Install xz + run: | + sudo apt-get install -y xz - name: Run cmake run: | diff --git a/.github/workflows/ci-tests-macos.yml b/.github/workflows/ci-tests-macos.yml index bf1611bb..bd662ae1 100644 --- a/.github/workflows/ci-tests-macos.yml +++ b/.github/workflows/ci-tests-macos.yml @@ -22,6 +22,10 @@ jobs: # a pull request then we can checkout the head. fetch-depth: 2 submodules: 'recursive' + + - name: Install xz + run: | + brew install xz - name: Run cmake run: | diff --git a/.github/workflows/ci-tests-privacy.yml b/.github/workflows/ci-tests-privacy.yml index d7dbe456..94e92a2c 100644 --- a/.github/workflows/ci-tests-privacy.yml +++ b/.github/workflows/ci-tests-privacy.yml @@ -22,6 +22,10 @@ jobs: # a pull request then we can checkout the head. fetch-depth: 2 submodules: 'recursive' + + - name: Install xz + run: | + sudo apt-get install -y xz - name: Run cmake run: | diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index c44919a9..e1573378 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -30,6 +30,10 @@ jobs: cmake . make -j 4 + - name: Install xz + run: | + sudo apt-get install -y xz + - name: Perform Unit Tests run: | ./ithitest diff --git a/lib/ithiutil.cpp b/lib/ithiutil.cpp index a3bc245f..86dc6af9 100644 --- a/lib/ithiutil.cpp +++ b/lib/ithiutil.cpp @@ -141,7 +141,7 @@ FILE* ithi_xzcat_decompress_open(char const* file_name, int* last_err) /* Running on windows requires that 7z.exe is installed */ xzcat_command = "7z.exe e -so"; #else - xzcat_command = "zxcat -k"; + xzcat_command = "xzcat -k"; #endif #ifdef _WINDOWS