Skip to content
This repository has been archived by the owner on May 13, 2020. It is now read-only.

Commit

Permalink
update ci scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
Alain Brenzikofer committed Oct 7, 2019
1 parent 68c9e29 commit 6ff6c45
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 16 deletions.
15 changes: 7 additions & 8 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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') {
Expand Down
10 changes: 4 additions & 6 deletions ci/install_rust.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 3 additions & 2 deletions scripts/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 6ff6c45

Please sign in to comment.