devops: fix firefox build (#3237)

This commit is contained in:
Andrey Lushnikov 2020-07-30 11:50:52 -07:00 committed by GitHub
parent e7ddf868bf
commit 9103ce0060
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 7 deletions

View file

@ -1,2 +1,2 @@
1145
Changed: lushnikov@chromium.org Wed 29 Jul 2020 17:27:10 PM PDT
1146
Changed: lushnikov@chromium.org Thu 30 Jul 2020 11:44:10 PM PDT

View file

@ -44,12 +44,18 @@ echo "mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/${OBJ_FOLDER}" >> .mozconfig
if [[ $1 == "--juggler" ]]; then
./mach build faster
else
# We manage Rust version ourselves.
echo "-- Using rust v${RUST_VERSION}"
rustup default "${RUST_VERSION}"
# TODO: rust is not in the PATH on Windows
if command -v rust >/dev/null; then
# We manage Rust version ourselves.
echo "-- Using rust v${RUST_VERSION}"
rustup default "${RUST_VERSION}"
fi
echo "-- Using cbindgen v${CBINDGEN_VERSION}"
cargo install cbindgen --version "${CBINDGEN_VERSION}"
# TODO: cargo is not in the PATH on Windows
if command -v cargo >/dev/null; then
echo "-- Using cbindgen v${CBINDGEN_VERSION}"
cargo install cbindgen --version "${CBINDGEN_VERSION}"
fi
./mach build
fi