Merge branch 'master' into cl-update-substrate-f17d023bbe179f15678ac9…

…989f471c9b18917e17
scs · Oct 7, 2019 · 3727c32 · 3727c32
2 parents b16075e + 6ff6c45
commit 3727c32
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -13,21 +13,20 @@ pipeline {
     }
     stage('Build') {
       steps {
-        sh './scripts/build.sh'
         sh 'cargo build'
       }
     }
-    // stage('Test') {
-    //   steps {
-    //     echo 'Stage TEST'
-    //     echo 'Not implemented yet'
-    //   }
-    // }
+    stage('Test') {
+      steps {
+        echo 'Stage TEST'
+        sh 'cargo test'
+      }
+    }
     stage('Lint') {
       steps {
         sh 'cargo check 2>&1 | tee rustc.log'
         sh 'cargo clean'
-        sh 'cargo +nightly-2019-05-21 clippy 2>&1 | tee clippy.log'
+        sh 'cargo +nightly-2019-08-01 clippy 2>&1 | tee clippy.log'
       }
     }
     stage('CheckLog') {

diff --git a/ci/install_rust.sh b/ci/install_rust.sh
@@ -14,14 +14,12 @@ chmod +x ./rustup.sh
 # Load new environment
 source $HOME/.cargo/env
 
-# Install nightly and beta toolchains, but set stable as a default
-rustup install nightly-2019-05-21
-# rustup install beta
-rustup default nightly-2019-05-21
+rustup install nightly-2019-08-01
+rustup default nightly-2019-08-01
 
 # Install aux components, clippy for linter, rustfmt for formatting
-rustup component add clippy --toolchain=nightly-2019-05-21
-rustup component add rustfmt --toolchain=nightly-2019-05-21
+rustup component add clippy --toolchain=nightly-2019-08-01
+rustup component add rustfmt --toolchain=nightly-2019-08-01
 
 # Show the installed versions
 rustup show