Merge #83

83: Bump SGX toolchain to match what we are using in backend r=Goirad a=jack-fortanix



Co-authored-by: Jack Lloyd <[email protected]>

Author: bors[bot]

.travis.yml

@@ -21,14 +21,14 @@ rust:
    - beta
    - nightly
    - nightly-2019-07-01
-   - nightly-2019-07-11
+   - nightly-2019-10-28
 env:
   global:
     - RUST_BACKTRACE=1
     # Pinned to this particular nightly version because of core_io. This can be
     # re-pinned whenever core_io is updated to the latest nightly.
     - CORE_IO_NIGHTLY=nightly-2019-07-01
-    - SGX_NIGHTLY=nightly-2019-07-11
+    - SGX_NIGHTLY=nightly-2019-10-28
     - LLVM_CONFIG_PATH=llvm-config-3.8
 script:
   - ./ct.sh

ct.sh

@@ -4,6 +4,11 @@ cd "$(dirname "$0")"
 
 cd "./mbedtls"
 
+if [ -z $TRAVIS_RUST_VERSION ]; then
+    echo "Expected TRAVIS_RUST_VERSION to be set in env"
+    exit 1
+fi
+
 if [ $TRAVIS_RUST_VERSION = "stable" ] || [ $TRAVIS_RUST_VERSION = "beta" ] || [ $TRAVIS_RUST_VERSION = "nightly" ]; then
     rustup default $TRAVIS_RUST_VERSION
     cargo test
@@ -22,4 +27,7 @@ elif [ $TRAVIS_RUST_VERSION = $SGX_NIGHTLY ]; then
     rustup target add --toolchain $SGX_NIGHTLY x86_64-fortanix-unknown-sgx
     cargo +$SGX_NIGHTLY test --no-run --target=x86_64-fortanix-unknown-sgx --features=sgx --no-default-features
 
+else
+    echo "Unknown version $TRAVIS_RUST_VERSION"
+    exit 1
 fi