mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer-rs.git
synced 2024-11-22 09:31:06 +00:00
ci: Update to cargo-c 0.9.26 and 0.10.3 when building for nightly
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer-rs/-/merge_requests/1491>
This commit is contained in:
parent
99f598a45a
commit
c9412e663b
2 changed files with 7 additions and 5 deletions
|
@ -36,11 +36,9 @@ if [ "$RUST_IMAGE_FULL" = "1" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$RUST_VERSION" = "nightly" ]; then
|
if [ "$RUST_VERSION" = "nightly" ]; then
|
||||||
# FIXME: Don't build cargo-c with --locked for now because otherwise a
|
cargo install --locked cargo-c --version 0.10.3+cargo-0.81
|
||||||
# version of ahash is used that doesn't build on nightly anymore
|
|
||||||
cargo install cargo-c --version 0.9.22+cargo-0.72
|
|
||||||
else
|
else
|
||||||
cargo install --locked cargo-c --version 0.9.22+cargo-0.72
|
cargo install --locked cargo-c --version 0.9.26+cargo-0.74
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$RUST_VERSION" = "nightly" ]; then
|
if [ "$RUST_VERSION" = "nightly" ]; then
|
||||||
|
|
|
@ -4,7 +4,11 @@ rustup --version
|
||||||
rustc --version
|
rustc --version
|
||||||
cargo --version
|
cargo --version
|
||||||
|
|
||||||
cargo install --locked cargo-c --version 0.9.26+cargo-0.72
|
if ("$RUST_VERSION" -eq "nightly") {
|
||||||
|
cargo install --locked cargo-c --version 0.10.3+cargo-0.81
|
||||||
|
} else {
|
||||||
|
cargo install --locked cargo-c --version 0.9.26+cargo-0.74
|
||||||
|
}
|
||||||
|
|
||||||
if (!$?) {
|
if (!$?) {
|
||||||
Write-Host "Failed to install cargo-c"
|
Write-Host "Failed to install cargo-c"
|
||||||
|
|
Loading…
Reference in a new issue