merge upstream

.gitlab-ci.yml

@@ -9,10 +9,9 @@ variables:
   GIT_STRATEGY:                    fetch
   GIT_SUBMODULE_STRATEGY:          recursive
   CI_SERVER_NAME:                  "GitLab CI"
-  CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
   CARGO_TARGET:                    x86_64-unknown-linux-gnu
 
-.no_git:                           &no_git #disable git strategy
+.no_git:                           &no_git # disable git strategy
   variables:
     GIT_STRATEGY:                  none
     GIT_SUBMODULE_STRATEGY:        none
@@ -32,12 +31,17 @@ variables:
     paths:
       - artifacts/
 
-.docker-cache-status:                      &docker-cache-status
-  dependencies:                    []
+.docker-cache-status:              &docker-cache-status
+  variables:
+    CARGO_HOME:                    "/cargo/${CI_JOB_NAME}"
   before_script:
+    - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache::server=debug sccache --start-server
     - sccache -s
   after_script:
-    - sccache -s
+    - 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
   tags:
     - linux-docker
 
@@ -47,50 +51,68 @@ cargo-check 0 3:
   <<:                              *docker-cache-status
   script:
     - time cargo check --target $CARGO_TARGET --locked --no-default-features
+    - 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
+    - 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"
+    - sccache -s
 
 cargo-audit:
   stage:                           test
+  <<:                              *docker-cache-status
   script:
     - cargo audit
-  tags:
-    - linux-docker
+    - sccache -s
 
 validate-chainspecs:
   stage:                           test
   <<:                              *docker-cache-status
   script:
     - ./scripts/gitlab/validate-chainspecs.sh
+    - sccache -s
 
 test-cpp:
   stage:                           build
   <<:                              *docker-cache-status
   script:
     - ./scripts/gitlab/test-cpp.sh
+    - sccache -s
 
 test-linux:
   stage:                           build
   <<:                              *docker-cache-status
   script:
     - ./scripts/gitlab/test-linux.sh
+    - sccache -s
+
+build-android:
+  stage:                           build
+  image:                           parity/rust-android:gitlab-ci
+  variables:
+    CARGO_TARGET:                  armv7-linux-androideabi
+  script:
+    - scripts/gitlab/build-linux.sh
+  tags:
+    - linux-docker
+  <<:                              *collect_artifacts
 
 build-linux:                       &build-linux
   stage:                           build
   only:                            *releaseable_branches
   <<:                              *docker-cache-status
   script:
     - scripts/gitlab/build-linux.sh
+    - sccache -s
   <<:                              *collect_artifacts
 
 build-linux-i386:
@@ -116,6 +138,7 @@ build-darwin:
   only:                            *releaseable_branches
   variables:
     CARGO_TARGET:                  x86_64-apple-darwin
+    CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
     CC:                            gcc
     CXX:                           g++
   script:
@@ -129,6 +152,7 @@ build-windows:
   only:                            *releaseable_branches
   variables:
     CARGO_TARGET:                  x86_64-pc-windows-msvc
+    CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
   script:
     - sh scripts/gitlab/build-windows.sh
   tags:
@@ -138,7 +162,7 @@ build-windows:
 publish-docker:
   stage:                           publish
   only:                            *releaseable_branches
-  cache: {}
+  cache:                           {}
   dependencies:
     - build-linux
   tags:
@@ -152,7 +176,7 @@ publish-snap:                      &publish-snap
   image:                           snapcore/snapcraft
   variables:
     BUILD_ARCH:                    amd64
-  cache: {}
+  cache:                           {}
   dependencies:
     - build-linux
   tags:
@@ -227,19 +251,9 @@ publish-docs:
     - tags
   except:
     - nightly
-  cache: {}
+  cache:                            {}
   script:
     - scripts/gitlab/publish-docs.sh
   tags:
     - linux-docker
 
-build-android:
-  stage:                           build
-  image:                           parity/rust-android:gitlab-ci
-  variables:
-    CARGO_TARGET:                  armv7-linux-androideabi
-  script:
-    - scripts/gitlab/build-linux.sh
-  tags:
-    - linux-docker
-  <<:                              *collect_artifacts

Cargo.toml

@@ -138,7 +138,8 @@ members = [
 	"util/triehash-ethereum",
 	"util/keccak-hasher",
 	"util/patricia-trie-ethereum",
-	"util/fastmap"
+	"util/fastmap",
+	"util/time-utils"
 ]
 
 [patch.crates-io]

ethcore/Cargo.toml

@@ -63,6 +63,7 @@ serde = "1.0"
 serde_derive = "1.0"
 stats = { path = "../util/stats" }
 tempdir = {version="0.3", optional = true}
+time-utils = { path = "../util/time-utils" }
 trace-time = "0.1"
 triehash-ethereum = { version = "0.2",  path = "../util/triehash-ethereum" }
 unexpected = { path = "../util/unexpected" }