From 6ff6c456d35b19df2235cf6f5986a9bd4274fe01 Mon Sep 17 00:00:00 2001
From: Alain Brenzikofer <alain.brenzikofer@scs.ch>
Date: Mon, 7 Oct 2019 14:26:05 +0200
Subject: [PATCH] update ci scripts

---
 Jenkinsfile        | 15 +++++++--------
 ci/install_rust.sh | 10 ++++------
 scripts/init.sh    |  5 +++--
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index dc2fd85..853a040 100755
--- 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
index 24ed737..c5b3fa6 100755
--- 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
diff --git a/scripts/init.sh b/scripts/init.sh
index ded015f..583c1c8 100755
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -9,8 +9,9 @@ if [ -z $CI_PROJECT_NAME ] ; then
    rustup update stable
 fi
 
-rustup target add wasm32-unknown-unknown --toolchain nightly-2019-05-21
+rustup target add wasm32-unknown-unknown --toolchain nightly
 
 # Install wasm-gc. It's useful for stripping slimming down wasm binaries.
 command -v wasm-gc || \
-	cargo +nightly-2019-05-21 install --git https://github.com/alexcrichton/wasm-gc --force
+        cargo +nightly install --git https://github.com/alexcrichton/wasm-gc --force
+