From 7fdf16eab948ea04c1e56fdb5a704ed88780f5c6 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Sun, 8 Apr 2018 18:23:27 +0200 Subject: update parser closes #69 this doesn't change functionality per se but improves diagnostics in some cases. Some hard errors have becomes warnings, for example: when `resources` is empty, or when `idle.path` is set to the default `idle` path. --- ci/install.sh | 9 +-------- ci/script.sh | 8 ++++---- 2 files changed, 5 insertions(+), 12 deletions(-) (limited to 'ci') diff --git a/ci/install.sh b/ci/install.sh index dd7de9e..8bc6a47 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -1,14 +1,7 @@ set -euxo pipefail main() { - case $TARGET in - thumbv*-none-eabi*) - cargo install --list | grep 'xargo v0.3.8' || \ - cargo install xargo --vers 0.3.8 - rustup component list | grep 'rust-src.*installed' || \ - rustup component add rust-src - ;; - esac + . } main diff --git a/ci/script.sh b/ci/script.sh index 222a1e0..9e91aad 100644 --- a/ci/script.sh +++ b/ci/script.sh @@ -9,13 +9,13 @@ main() { case $TARGET in thumbv7em-none-eabi*) - xargo check --target $TARGET --features cm7-r0p1 - xargo check --target $TARGET --features cm7-r0p1 --examples + cargo check --target $TARGET --features cm7-r0p1 + cargo check --target $TARGET --features cm7-r0p1 --examples ;; esac - xargo check --target $TARGET - xargo check --target $TARGET --examples + cargo check --target $TARGET + cargo check --target $TARGET --examples } main -- cgit v1.2.3 From bcce6b988b05b180ae12f91fe3468ecc76b6a0d0 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 16 Apr 2018 21:39:16 +0200 Subject: fix ci/install.sh --- ci/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/install.sh b/ci/install.sh index 8bc6a47..e41f9c4 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -1,7 +1,7 @@ set -euxo pipefail main() { - . + : } main -- cgit v1.2.3 From bfa56e12f7a3ec3734e329f00d98ce9a953fce6d Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Mon, 16 Apr 2018 21:44:02 +0200 Subject: install rust-std component --- ci/install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/install.sh b/ci/install.sh index e41f9c4..3c41921 100644 --- a/ci/install.sh +++ b/ci/install.sh @@ -1,7 +1,9 @@ set -euxo pipefail main() { - : + if [ $TARGET != x86_64-unknown-linux-gnu ]; then + rustup target add $TARGET + fi } main -- cgit v1.2.3