From 1aba1a2dfa8f00c85079d5b3799ba601138f5376 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Krawiec?= <lmkrawiec@gmail.com>
Date: Sun, 12 Nov 2023 00:46:44 +0100
Subject: [PATCH] use cross environment for x86_64-unknown-linux-musl builds

---
 .github/workflows/build-and-test.yml |  9 +--------
 Cargo.lock                           | 12 ++++++------
 Cargo.toml                           |  1 +
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index ae7f165..fee42b6 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -61,7 +61,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install cross (non-x86_64 linux)
-        if: "!contains(matrix.target, 'x86_64') && runner.os == 'Linux'"
+        if: "matrix.target != 'x86_64-unknown-linux-gnu' && runner.os == 'Linux'"
         run: |
           pushd "$(mktemp -d)"
           wget https://github.com/cross-rs/cross/releases/download/v0.2.4/cross-x86_64-unknown-linux-musl.tar.gz
@@ -70,13 +70,6 @@ jobs:
           popd
           echo CARGO=cross >> $GITHUB_ENV
 
-      - name: Install dependencies (x86_64-unknown-linux-musl)
-        if: matrix.target == 'x86_64-unknown-linux-musl'
-        run: |
-          sudo apt-get update
-          sudo apt-get install musl-tools
-          sudo ln -s "/usr/bin/g++" "/usr/bin/musl-g++"
-
       - name: Set up extra cargo flags
         if: matrix.no-zstd-thin
         run: |
diff --git a/Cargo.lock b/Cargo.lock
index 489435b..b91d467 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -176,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.81"
+version = "1.0.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
 dependencies = [
  "jobserver",
  "libc",
@@ -1256,9 +1256,9 @@ checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
 
 [[package]]
 name = "unrar"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "850dc99da3a3c12a9400a52a3c510057bf2b16c6c9a495492850d25ed9d757ab"
+checksum = "c844cee902acdbe8942c0188cb1c2b7ab268928ceb926ef1550babd921757971"
 dependencies = [
  "bitflags 1.3.2",
  "regex",
@@ -1268,9 +1268,9 @@ dependencies = [
 
 [[package]]
 name = "unrar_sys"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95e536227cb6a91f8e88adb0219912e004a107c9724a094f90baad9229281efa"
+checksum = "1f691c507016acf0a56fae074981ce30f13f8b035c8f80aa878f41905d96e390"
 dependencies = [
  "cc",
  "libc",
diff --git a/Cargo.toml b/Cargo.toml
index 178b6a7..e9b82f1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -30,6 +30,7 @@ snap = "1.1.0"
 tar = "0.4.40"
 tempfile = "3.8.1"
 time = { version = "0.3.30", default-features = false }
+unrar = "0.5.2"
 xz2 = "0.1.7"
 zip = { version = "0.6.6", default-features = false, features = ["time"] }
 zstd = { version = "0.13.0", default-features = false }