From 4424155d39e4df3497a16365eb3a95042fcb28d1 Mon Sep 17 00:00:00 2001 From: Gav Wood Date: Tue, 13 Dec 2016 20:49:26 +0100 Subject: [PATCH] Similar checks on file changes to other tests. --- .gitlab-ci.yml | 10 ++++++---- ethcore/src/types/mod.rs.in | 3 ++- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7e413c21..def1c0466 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -419,9 +419,10 @@ test-darwin: - triggers before_script: - git submodule update --init --recursive + - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l) script: - export RUST_BACKTRACE=1 - - ./test.sh $CARGOFLAGS + - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi tags: - osx allow_failure: true @@ -468,10 +469,10 @@ test-rust-beta: image: ethcore/rust:beta before_script: - git submodule update --init --recursive + - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l) script: - export RUST_BACKTRACE=1 - - echo $JS_FILES_MODIFIED - - ./test.sh $CARGOFLAGS + - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi tags: - rust - rust-beta @@ -483,9 +484,10 @@ test-rust-nightly: image: ethcore/rust:nightly before_script: - git submodule update --init --recursive + - export RUST_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep -v -e ^js -e ^\\. -e ^LICENSE -e ^README.md -e ^appveyor.yml -e ^test.sh -e ^windows/ -e ^scripts/ -e^mac/ -e ^nsis/ | wc -l) script: - export RUST_BACKTRACE=1 - - ./test.sh $CARGOFLAGS + - if [ $RUST_FILES_MODIFIED -eq 0 ]; then echo "Skipping Rust tests since no Rust files modified."; else ./test.sh $CARGOFLAGS; fi tags: - rust - rust-nightly diff --git a/ethcore/src/types/mod.rs.in b/ethcore/src/types/mod.rs.in index 47a4b6a84..a5a8fb4ef 100644 --- a/ethcore/src/types/mod.rs.in +++ b/ethcore/src/types/mod.rs.in @@ -34,4 +34,5 @@ pub mod block_import_error; pub mod restoration_status; pub mod snapshot_manifest; pub mod mode; -pub mod pruning_info; \ No newline at end of file +pub mod pruning_info; +pub mod security_level; \ No newline at end of file