beta ci: backport missing diff from master

.gitlab-ci.yml

@@ -34,45 +34,65 @@ variables:
 .docker-cache-status:              &docker-cache-status
   variables:
     CARGO_HOME:                    "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}"
+  dependencies:                    []
   before_script:
-    - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache::server=debug sccache --start-server
+    - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_debug.log
+        RUST_LOG=sccache=debug
+        sccache --start-server
     - sccache -s
   after_script:
-    - echo "All crate-types:"
-    - grep 'parse_arguments.*--crate-type' sccache_error.log | sed -re 's/.*"--crate-type", "([^"]+)".*/\1/' | sort | uniq -c
-    - echo "Non-cacheable reasons:"
-    - grep CannotCache sccache_error.log | sed -re 's/.*CannotCache\((.+)\).*/\1/' | sort | uniq -c
+    # sccache debug info
+    - if test -e sccache_debug.log;
+      then
+        echo "_____sccache_debug.log listing start:_____";
+        cat sccache_debug.log;
+        echo "_____sccache_debug.log listing end_____";
+        echo "All crate-types:";
+        grep 'parse_arguments.*--crate-type' sccache_debug.log | sed -re 's/.*"--crate-type", "([^"]+)".*/\1/' | sort | uniq -c;
+        echo "_____Non-cacheable reasons:_____";
+        grep CannotCache sccache_debug.log | sed -re 's/.*CannotCache\((.+)\).*/\1/' | sort | uniq -c;
+      else
+        echo "_____No logs from sccache_____";
+        exit 0;
+      fi
   tags:
     - linux-docker
 
+.build-on-linux:                   &build-on-linux
+  stage:                           build
+  <<:                              *docker-cache-status
+  <<:                              *collect_artifacts
+  script:
+    - scripts/gitlab/build-linux.sh
+    - sccache -s
+
 
 cargo-check 0 3:
   stage:                           test
   <<:                              *docker-cache-status
   script:
-    - time cargo check --target $CARGO_TARGET --locked --no-default-features
+    - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose --color=always
     - sccache -s
 
 cargo-check 1 3:
   stage:                           test
   <<:                              *docker-cache-status
   script:
-    - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features
+    - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose --color=always
     - sccache -s
 
 cargo-check 2 3:
   stage:                           test
   <<:                              *docker-cache-status
   script:
-    - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio"
+    - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose --color=always
     - sccache -s
 
 cargo-audit:
   stage:                           test
   <<:                              *docker-cache-status
   script:
     - cargo audit
-    - sccache -s
 
 validate-chainspecs:
   stage:                           test
@@ -92,55 +112,64 @@ test-linux:
   stage:                           build
   <<:                              *docker-cache-status
   script:
-    - ./scripts/gitlab/test-linux.sh
+    - ./scripts/gitlab/test-linux.sh stable
     - sccache -s
 
-build-android:
+test-linux-beta:
   stage:                           build
-  image:                           parity/rust-parity-ethereum-android-build:stretch
-  variables:
-    CARGO_TARGET:                  armv7-linux-androideabi
+  only:                            *releaseable_branches
   <<:                              *docker-cache-status
-  <<:                              *collect_artifacts
   script:
-    - scripts/gitlab/build-linux.sh
-  tags:
-    - linux-docker
+    - ./scripts/gitlab/test-linux.sh beta
+    - sccache -s
 
-build-linux:                       &build-linux
+test-linux-nightly:
   stage:                           build
   only:                            *releaseable_branches
   <<:                              *docker-cache-status
-  <<:                              *collect_artifacts
   script:
-    - scripts/gitlab/build-linux.sh
+    - ./scripts/gitlab/test-linux.sh nightly
     - sccache -s
+  allow_failure:                   true
+
+build-android:
+  <<:                              *build-on-linux
+  image:                           parity/rust-parity-ethereum-android-build:stretch
+  variables:
+    CARGO_TARGET:                  armv7-linux-androideabi
+
+build-linux:
+  <<:                              *build-on-linux
+  only:                            *releaseable_branches
 
 build-linux-i386:
-  <<:                              *build-linux
+  <<:                              *build-on-linux
+  only:                            *releaseable_branches
   image:                           parity/rust-parity-ethereum-build:i386
   variables:
     CARGO_TARGET:                  i686-unknown-linux-gnu
 
 build-linux-arm64:
-  <<:                              *build-linux
+  <<:                              *build-on-linux
+  only:                            *releaseable_branches
   image:                           parity/rust-parity-ethereum-build:arm64
   variables:
     CARGO_TARGET:                  aarch64-unknown-linux-gnu
 
 build-linux-armhf:
-  <<:                              *build-linux
+  <<:                              *build-on-linux
+  only:                            *releaseable_branches
   image:                           parity/rust-parity-ethereum-build:armhf
   variables:
     CARGO_TARGET:                  armv7-unknown-linux-gnueabihf
 
 build-darwin:
   stage:                           build
-  only:                            *releaseable_branches
   <<:                              *collect_artifacts
+  only:                            *releaseable_branches
   variables:
     CARGO_TARGET:                  x86_64-apple-darwin
-    CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
+    CARGO_HOME:                    "${CI_PROJECT_DIR}/.cargo"
     CC:                            gcc
     CXX:                           g++
   script:

scripts/gitlab/build-linux.sh

@@ -18,13 +18,13 @@ cat .cargo/config
 echo "_____ Building target: "$CARGO_TARGET" _____"
 if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ]
 then
-  time cargo build --target $CARGO_TARGET --release -p parity-clib --features final
+  time cargo build --target $CARGO_TARGET --verbose --color=always --release -p parity-clib --features final
 else
-  time cargo build --target $CARGO_TARGET --release --features final
-  time cargo build --target $CARGO_TARGET --release -p evmbin
-  time cargo build --target $CARGO_TARGET --release -p ethstore-cli
-  time cargo build --target $CARGO_TARGET --release -p ethkey-cli
-  time cargo build --target $CARGO_TARGET --release -p whisper-cli
+  time cargo build --target $CARGO_TARGET --verbose --color=always --release --features final
+  time cargo build --target $CARGO_TARGET --verbose --color=always --release -p evmbin
+  time cargo build --target $CARGO_TARGET --verbose --color=always --release -p ethstore-cli
+  time cargo build --target $CARGO_TARGET --verbose --color=always --release -p ethkey-cli
+  time cargo build --target $CARGO_TARGET --verbose --color=always --release -p whisper-cli
 fi
 
 echo "_____ Post-processing binaries _____"

scripts/gitlab/build-windows.sh

@@ -14,11 +14,11 @@ echo "RUSTC_WRAPPER:    " $RUSTC_WRAPPER
 echo "SCCACHE_DIR:      " $SCCACHE_DIR
 
 echo "_____ Building target: "$CARGO_TARGET" _____"
-time cargo build --target $CARGO_TARGET --release --features final
-time cargo build --target $CARGO_TARGET --release -p evmbin
-time cargo build --target $CARGO_TARGET --release -p ethstore-cli
-time cargo build --target $CARGO_TARGET --release -p ethkey-cli
-time cargo build --target $CARGO_TARGET --release -p whisper-cli
+time cargo build --target $CARGO_TARGET --verbose --release --features final
+time cargo build --target $CARGO_TARGET --verbose --release -p evmbin
+time cargo build --target $CARGO_TARGET --verbose --release -p ethstore-cli
+time cargo build --target $CARGO_TARGET --verbose --release -p ethkey-cli
+time cargo build --target $CARGO_TARGET --verbose --release -p whisper-cli
 
 echo "__________Sign binaries__________"
 scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity.exe

scripts/gitlab/test-linux.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
+# ARGUMENT $1 Rust flavor to run test with (stable/beta/nightly)
+
 echo "________Running test-linux.sh________"
 set -e # fail on any error
 set -u # treat unset variables as error
@@ -8,5 +10,8 @@ OPTIONS="--release"
 #use nproc `linux only
 THREADS=$(nproc)
 
+rustup default $1
+rustup show
+
 echo "________Running Parity Full Test Suite________"
-time cargo test $OPTIONS --features "$FEATURES" --locked --all --target $CARGO_TARGET -- --test-threads $THREADS
+time cargo test $OPTIONS --features "$FEATURES" --locked --all --target $CARGO_TARGET --verbose --color=always -- --test-threads $THREADS

scripts/gitlab/validate-chainspecs.sh

@@ -6,7 +6,7 @@ echo "________Running validate_chainspecs.sh________"
 ERR=0
 
 echo "________Validate chainspecs________"
-time cargo build --release -p chainspec
+time cargo build --release -p chainspec --verbose --color=always
 
 for spec in ethcore/res/*.json; do
     if ! ./target/release/chainspec "$spec"; then ERR=1; fi