update the CI

Author: japaric

.travis.yml

@@ -12,27 +12,38 @@ matrix:
   include:
     # Nightly, for testing
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Atmel
-      rust: nightly
+      rust: beta
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Freescale
-      rust: nightly
+      rust: beta
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Fujitsu
-      rust: nightly
+      rust: beta
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Holtek
-      rust: nightly
+      rust: beta
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Nordic
-      rust: nightly
+      rust: beta
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Nuvoton
-      rust: nightly
+      rust: beta
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=NXP
-      rust: nightly
+      rust: beta
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=SiliconLabs
-      rust: nightly
+      rust: beta
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Spansion
-      rust: nightly
+      rust: beta
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=STMicro
-      rust: nightly
+      rust: beta
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=Toshiba
-      rust: nightly
+      rust: beta
+
     - env: TARGET=x86_64-unknown-linux-gnu VENDOR=OTHER
       rust: nightly
 

ci/script.sh

@@ -8,8 +8,14 @@ test_svd() {
     )
 
     # NOTE we care about errors in svd2rust, but not about errors / warnings in rustfmt
-    target/$TARGET/release/svd2rust -i $td/${1}.svd | \
-        ( rustfmt 2>/dev/null > $td/src/lib.rs || true )
+    local cwd=$(pwd)
+    pushd $td
+    $cwd/target/$TARGET/release/svd2rust -i ${1}.svd
+
+    mv lib.rs src/lib.rs
+
+    rustfmt src/lib.rs
+    popd
 
     cargo check --manifest-path $td/Cargo.toml
 }
@@ -34,18 +40,17 @@ main() {
 
     # test crate
     cargo init --name foo $td
-    echo 'bare-metal = "0.1.0"' >> $td/Cargo.toml
-    echo 'cortex-m = "0.4.0"' >> $td/Cargo.toml
-    echo 'cortex-m-rt = "0.3.0"' >> $td/Cargo.toml
+    echo 'cortex-m = "0.5.0"' >> $td/Cargo.toml
+    echo 'cortex-m-rt = "0.5.0"' >> $td/Cargo.toml
     echo 'vcell = "0.1.0"' >> $td/Cargo.toml
-    echo 'msp430 = "0.1.0"' >> $td/Cargo.toml
-    # echo 'riscv = "0.1.4"' >> $td/Cargo.toml
-    # echo 'riscv-rt = "0.1.3"' >> $td/Cargo.toml
     echo '[profile.dev]' >> $td/Cargo.toml
     echo 'incremental = false' >> $td/Cargo.toml
 
     case $VENDOR in
         Atmel)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # BAD-SVD missing resetValue
             # test_svd AT91SAM9CN11
             # test_svd AT91SAM9CN12
@@ -129,6 +134,9 @@ main() {
         ;;
 
         Freescale)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # BAD-SVD bad enumeratedValue value
             # test_svd MKV56F20
             # test_svd MKV56F22
@@ -277,6 +285,9 @@ main() {
         ;;
 
         Fujitsu)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # OK
             test_svd MB9AF10xN
             test_svd MB9AF10xR
@@ -381,6 +392,9 @@ main() {
         ;;
 
         Holtek)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # OK
             test_svd ht32f125x
             test_svd ht32f175x
@@ -389,6 +403,18 @@ main() {
 
         # test other targets (architectures)
         OTHER)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.1.0"' >> $td/Cargo.toml
+
+            echo '[dependencies.msp430]' >> $td/Cargo.toml
+            echo 'version = "0.1.0"' >> $td/Cargo.toml
+
+            # echo '[dependencies.riscv]' >> $td/Cargo.toml
+            # echo 'version = "0.2.0"' >> $td/Cargo.toml
+
+            # echo '[dependencies.riscv-rt]' >> $td/Cargo.toml
+            # echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             (
                 cd $td &&
                     curl -LO \
@@ -415,6 +441,9 @@ main() {
         ;;
 
         Nordic)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # BAD-SVD two enumeratedValues have the same value
             # test_svd nrf52
 
@@ -423,12 +452,18 @@ main() {
         ;;
 
         Nuvoton)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # OK
             test_svd M051_Series
             test_svd NUC100_Series
         ;;
 
         NXP)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # BAD-SVD two enumeratedValues have the same name
             # test_svd LPC11Exx_v5
             # test_svd LPC11Uxx_v7
@@ -465,6 +500,9 @@ main() {
         ;;
 
         SiliconLabs)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # #99 regression tests
             test_svd SIM3C1x4_SVD
             test_svd SIM3C1x6_SVD
@@ -481,6 +519,9 @@ main() {
         ;;
 
         Spansion)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # OK
             test_svd MB9AF12xK
             test_svd MB9AF12xL
@@ -576,6 +617,9 @@ main() {
         ;;
 
         STMicro)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # OK
             test_svd STM32F030
             test_svd STM32F031x
@@ -626,6 +670,9 @@ main() {
         ;;
 
         Toshiba)
+            echo '[dependencies.bare-metal]' >> $td/Cargo.toml
+            echo 'version = "0.2.0"' >> $td/Cargo.toml
+
             # BAD-SVD resetValue is bigger than the register size
             # test_svd M365
             # test_svd M367