use newer rust + cargo again
This commit is contained in:
parent
f78a1c2a36
commit
56b66d16f3
|
@ -38,8 +38,6 @@ _DEPENDENCIES="wget git xvfb \
|
|||
python \
|
||||
libffi-dev \
|
||||
nodejs-mozilla \
|
||||
cargo \
|
||||
rustc \
|
||||
nasm-mozilla"
|
||||
|
||||
# cargo \
|
||||
|
@ -67,7 +65,7 @@ else
|
|||
apt-get -y install clang-10 libclang-10-dev
|
||||
fi
|
||||
|
||||
# we need a more recent rust
|
||||
# curl https://sh.rustup.rs -o rustup.sh
|
||||
# bash rustup.sh -y
|
||||
# source /root/.cargo/env
|
||||
we need a more recent rust
|
||||
curl https://sh.rustup.rs -o rustup.sh
|
||||
bash rustup.sh -y
|
||||
source /root/.cargo/env
|
||||
|
|
|
@ -16,7 +16,8 @@ export DEB_BUILD_HARDENING_FORMAT=1
|
|||
export DEB_BUILD_HARDENING_PIE=1
|
||||
# export PATH=/usr/lib/nasm-mozilla/bin:$PATH
|
||||
|
||||
# source /root/.cargo/env
|
||||
# add cargo binary to path
|
||||
source /root/.cargo/env
|
||||
|
||||
# we do change / unset some of them later, but setting them as set by Arch
|
||||
# might make it easier to maintain changes in build scripts on both sides
|
||||
|
@ -62,9 +63,6 @@ cd $srcdir;
|
|||
|
||||
rm -f mozconfig
|
||||
|
||||
# add cargo binary to path
|
||||
# source /root/.cargo/env
|
||||
|
||||
# install cbindgen
|
||||
cargo install --version 0.19.0 cbindgen
|
||||
|
||||
|
|
|
@ -11,7 +11,7 @@ LAUNCHER_SCRIPT=$3;
|
|||
CI_PROJECT_DIR=${CI_PROJECT_DIR:-$(realpath $(dirname $0)/../)}
|
||||
_SCRIPT_FOLDER=$(realpath $(dirname $0));
|
||||
_EXTRACTED_TARBALL_FOLDER=$_SCRIPT_FOLDER/librewolf;
|
||||
_SETTINGS_TAG=${SETTINGS_TAG:-'1.3'}
|
||||
_SETTINGS_TAG=${SETTINGS_TAG:-'1.5'}
|
||||
_SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git';
|
||||
|
||||
# Extracts the binary tarball
|
||||
|
|
Loading…
Reference in a new issue