github/ouch
1
1
Fork 0
mirror of https://github.com/ouch-org/ouch.git synced 2025-06-06 19:45:29 +00:00
Code Issues 15 Packages Projects Releases Wiki Activity

use cross environment for x86_64-unknown-linux-musl builds

Browse Source
This commit is contained in:
Łukasz Krawiec 2023-11-12 00:46:44 +01:00 committed by João Marcos
parent dade163243
commit 1aba1a2dfa
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/build-and-test.yml vendored
View File

@ -61,7 +61,7 @@ jobs:
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install cross (non-x86_64 linux) - 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: | run: |
pushd "$(mktemp -d)" pushd "$(mktemp -d)"
wget https://github.com/cross-rs/cross/releases/download/v0.2.4/cross-x86_64-unknown-linux-musl.tar.gz 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 popd
echo CARGO=cross >> $GITHUB_ENV 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 - name: Set up extra cargo flags
if: matrix.no-zstd-thin if: matrix.no-zstd-thin
run: | run: |

12
Cargo.lock generated
View File

@ -176,9 +176,9 @@ dependencies = [
[[package]] [[package]]
name = "cc" name = "cc"
version = "1.0.81" version = "1.0.83"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c6b2562119bf28c3439f7f02db99faf0aa1a8cdfe5772a2ee155d32227239f0" checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
dependencies = [ dependencies = [
"jobserver", "jobserver",
"libc", "libc",
@ -1256,9 +1256,9 @@ checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
[[package]] [[package]]
name = "unrar" name = "unrar"
version = "0.5.1" version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "850dc99da3a3c12a9400a52a3c510057bf2b16c6c9a495492850d25ed9d757ab" checksum = "c844cee902acdbe8942c0188cb1c2b7ab268928ceb926ef1550babd921757971"
dependencies = [ dependencies = [
"bitflags 1.3.2", "bitflags 1.3.2",
"regex", "regex",
@ -1268,9 +1268,9 @@ dependencies = [
[[package]] [[package]]
name = "unrar_sys" name = "unrar_sys"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "95e536227cb6a91f8e88adb0219912e004a107c9724a094f90baad9229281efa" checksum = "1f691c507016acf0a56fae074981ce30f13f8b035c8f80aa878f41905d96e390"
dependencies = [ dependencies = [
"cc", "cc",
"libc", "libc",

1
Cargo.toml
View File

@ -30,6 +30,7 @@ snap = "1.1.0"
tar = "0.4.40" tar = "0.4.40"
tempfile = "3.8.1" tempfile = "3.8.1"
time = { version = "0.3.30", default-features = false } time = { version = "0.3.30", default-features = false }
unrar = "0.5.2"
xz2 = "0.1.7" xz2 = "0.1.7"
zip = { version = "0.6.6", default-features = false, features = ["time"] } zip = { version = "0.6.6", default-features = false, features = ["time"] }
zstd = { version = "0.13.0", default-features = false } zstd = { version = "0.13.0", default-features = false }