Run systest for ARM targets
Also bump to the 1.19 image to make targets a bit easier to manage.
This commit is contained in:
parent
581fadc34c
commit
8450cfbb52
11
circle.yml
11
circle.yml
|
|
@ -1,12 +1,12 @@
|
|||
job: &JOB
|
||||
working_directory: ~/build
|
||||
docker:
|
||||
- image: jimmycuadra/rust:1.18.0
|
||||
- image: jimmycuadra/rust:1.19.0
|
||||
steps:
|
||||
- checkout
|
||||
- run: apt-get update
|
||||
- run: apt-get install -y curl
|
||||
- run: RUST_VERSION=1.18.0 ./test/add_target.sh
|
||||
- run: RUST_VERSION=1.19.0 ./test/add_target.sh
|
||||
- restore_cache:
|
||||
key: registry
|
||||
- run: cargo generate-lockfile
|
||||
|
|
@ -26,11 +26,7 @@ job: &JOB
|
|||
key: deps-1.18.0-{{ checksum "Cargo.lock" }}-{{ checksum "~/lib_key" }}
|
||||
- run: |
|
||||
export OPENSSL_DIR=$HOME/openssl
|
||||
case "${NO_RUN}" in
|
||||
"1") CMD=build;;
|
||||
"") CMD=run;;
|
||||
esac
|
||||
cargo $CMD --manifest-path=systest/Cargo.toml --target $TARGET
|
||||
cargo run --manifest-path=systest/Cargo.toml --target $TARGET
|
||||
- run: |
|
||||
export OPENSSL_DIR=$HOME/openssl
|
||||
export PATH=$OPENSSL_DIR/bin:$PATH
|
||||
|
|
@ -73,6 +69,7 @@ armhf: &ARMHF
|
|||
NO_RUN: 1
|
||||
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc
|
||||
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_AR: arm-linux-gnueabihf-ar
|
||||
CARGO_TARGET_ARM_UNKNOWN_LINUX_GNUEABIHF_RUNNER: qemu-arm-static
|
||||
|
||||
base: &BASE
|
||||
RUST_BACKTRACE: 1
|
||||
|
|
|
|||
|
|
@ -9,24 +9,13 @@ case "${TARGET}" in
|
|||
apt-get install -y --no-install-recommends gcc-multilib
|
||||
;;
|
||||
"arm-unknown-linux-gnueabihf")
|
||||
echo "deb http://emdebian.org/tools/debian/ jessie main" \
|
||||
> /etc/apt/sources.list.d/crosstools.list
|
||||
curl http://emdebian.org/tools/debian/emdebian-toolchain-archive.key | apt-key add -
|
||||
dpkg --add-architecture armhf
|
||||
apt-get update
|
||||
apt-get install -y --no-install-recommends \
|
||||
gcc-arm-linux-gnueabihf \
|
||||
libc6-dev:armhf
|
||||
libc6-dev:armhf \
|
||||
qemu-user-static
|
||||
;;
|
||||
esac
|
||||
|
||||
OUT=/tmp/std.tar.gz
|
||||
curl -o ${OUT} https://static.rust-lang.org/dist/rust-std-${RUST_VERSION}-${TARGET}.tar.gz
|
||||
|
||||
WORKDIR=/tmp/std
|
||||
mkdir -p ${WORKDIR}
|
||||
cd ${WORKDIR}
|
||||
|
||||
tar --strip-components=1 -xzf ${OUT}
|
||||
|
||||
./install.sh
|
||||
rustup target add ${TARGET}
|
||||
|
|
|
|||
Loading…
Reference in New Issue