Skip to content

Commit b0313ee

Browse files
committed
ci: Use cargo-c binaries for all linux archs
1 parent 7dfc7a3 commit b0313ee

1 file changed

Lines changed: 10 additions & 25 deletions

File tree

wheelbuild/config.sh

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CONFIG_DIR=$(abspath $(dirname "${BASH_SOURCE[0]}"))
55

66
ARCHIVE_SDIR=pillow-avif-plugin-depends
77
LIBAVIF_VERSION=0.11.0
8-
CARGO_C_VERSION=0.9.5
8+
CARGO_C_VERSION=0.9.13
99
AOM_VERSION=3.5.0
1010
DAV1D_VERSION=1.0.0
1111
SVT_AV1_VERSION=1.3.0
@@ -163,33 +163,18 @@ function install_cargo_c {
163163
echo "::group::Install cargo-c"
164164
if [ -n "$IS_MACOS" ]; then
165165
brew install cargo-c
166-
elif [[ "$PLAT" != "x86_64" ]] || [[ -n "$IS_ALPINE" ]]; then
167-
if [[ "$MB_ML_VER" == "1" ]]; then
168-
build_openssl
169-
fi
170-
CARGO_C_VENDOR_TGZ=$ARCHIVE_SDIR/cargo-c-vendor-$CARGO_C_VERSION.tar.gz
171-
if [ -e $CARGO_C_VENDOR_TGZ ]; then
172-
mkdir -p "$HOME/.cargo"
173-
VENDOR_DIR=$(pwd -P)/$ARCHIVE_SDIR/vendor
174-
rm -rf $VENDOR_DIR
175-
tar -C $ARCHIVE_SDIR -zxf $CARGO_C_VENDOR_TGZ
176-
cat > ~/.cargo/config <<EOF
177-
[source.crates-io]
178-
replace-with = "vendored-sources"
179-
180-
[source.vendored-sources]
181-
directory = "$VENDOR_DIR"
182-
EOF
183-
fi
184-
fetch_unpack \
185-
"https://github.com/lu-zero/cargo-c/archive/refs/tags/v$CARGO_C_VERSION.tar.gz" \
186-
"cargo-c-$CARGO_C_VERSION.tar.gz"
187-
(cd cargo-c-$CARGO_C_VERSION \
188-
&& cargo install --path .)
189166
else
190167
mkdir -p $HOME/.cargo/bin
168+
local archive_fname
169+
if [ "$PLAT" == "arm64" ]; then
170+
archive_fname=cargo-c-linux-aarch64.tar.gz
171+
elif [ "$PLAT" == "i686" ]; then
172+
archive_fname=cargo-c-linux-i686.tar.gz
173+
else
174+
archive_fname=cargo-c-linux.tar.gz
175+
fi
191176
fetch_unpack \
192-
https://github.com/lu-zero/cargo-c/releases/download/v$CARGO_C_VERSION/cargo-c-linux.tar.gz \
177+
https://github.com/fdintino/cargo-c/releases/download/v$CARGO_C_VERSION/$archive_fname \
193178
cargo-c-$CARGO_C_VERSION-linux.tar.gz
194179
mv cargo-c{api,build,install} $HOME/.cargo/bin
195180
fi

0 commit comments

Comments
 (0)