Merge #566

566: Re-enable Espressif (merge once upstream is fixed) r=burrbull a=adamgreig

Reverts #565

Co-authored-by: Adam Greig <adam@adamgreig.com>

Author: bors[bot]

.github/workflows/ci.yml

@@ -57,14 +57,12 @@ jobs:
             TARGET: x86_64-unknown-linux-gnu
             TRAVIS_OS_NAME: linux
 
-# Espressif testing disabled as xensa-lx 0.4.0 is now broken on nightly,
-# see https://github.com/esp-rs/xtensa-lx/issues/14
-#           # Use nightly for architectures which don't support stable
-#         - rust: nightly
-#           experimental: true
-#           vendor: Espressif
-#           TARGET: x86_64-unknown-linux-gnu
-#           TRAVIS_OS_NAME: linux
+            # Use nightly for architectures which don't support stable
+          - rust: nightly
+            experimental: true
+            vendor: Espressif
+            TARGET: x86_64-unknown-linux-gnu
+            TRAVIS_OS_NAME: linux
 
           # OSX
           - rust: stable

ci/script.sh

@@ -609,12 +609,12 @@ main() {
             echo 'version = "1.0.0"' >> $td/Cargo.toml
 
             echo '[dependencies.xtensa-lx]' >> $td/Cargo.toml
-            echo 'version = "0.4.0"' >> $td/Cargo.toml
-            echo 'features = ["lx6"]' >> $td/Cargo.toml
+            echo 'version = "0.6.0"' >> $td/Cargo.toml
+            echo 'features = ["esp32"]' >> $td/Cargo.toml
 
             echo '[dependencies.xtensa-lx-rt]' >> $td/Cargo.toml
-            echo 'version = "0.7.0"' >> $td/Cargo.toml
-            echo 'features = ["lx6"]' >> $td/Cargo.toml
+            echo 'version = "0.8.0"' >> $td/Cargo.toml
+            echo 'features = ["esp32"]' >> $td/Cargo.toml
 
             test_svd_for_target xtensa-lx https://raw.githubusercontent.com/esp-rs/esp32/master/svd/esp32.svd
         ;;