Merge branch 'master' into ao-upgrade-ethereum-types

* master: Upgrade to parity-crypto 0.4 (#10650) new image (#10673) Add SealingState; don't prepare block when not ready. (#10529) Fix compiler warning (that will become an error) (#10683)
openethereum · May 28, 2019 · 4f398f4 · 4f398f4
2 parents 348984b + 9584fae
commit 4f398f4
Show file tree

Hide file tree

Showing 33 changed files with 481 additions and 232 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -4,11 +4,13 @@ stages:
   - publish
   - optional
 
-image:                             parity/rust-parity-ethereum-build:xenial
+image:                             parity/parity-ci-linux:latest
 variables:
   GIT_STRATEGY:                    fetch
   GIT_SUBMODULE_STRATEGY:          recursive
   CI_SERVER_NAME:                  "GitLab CI"
+  CARGO_HOME:                      "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
+  SCCACHE_DIR:                     "/ci-cache/${CI_PROJECT_NAME}/sccache"
   CARGO_TARGET:                    x86_64-unknown-linux-gnu
 
 .no_git:                           &no_git # disable git strategy