sccache --stop-server -> sccache --show-stats (#11255)

openethereum · Nov 12, 2019 · 9f94473 · 9f94473
1 parent 42437fb
commit 9f94473
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -37,6 +37,12 @@ variables:
   before_script:
     - rustup show
     - cargo --version
+  retry:
+    max: 2
+    when:
+      - runner_system_failure
+      - unknown_failure
+      - api_failure
   tags:
     - linux-docker
 
@@ -63,42 +69,35 @@ cargo-check 0 3:
   <<:                              *docker-cache-status
   script:
     - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose --color=always
-    - sccache --stop-server
+    - sccache --show-stats
 
 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 --verbose --color=always
-    - sccache --stop-server
+    - sccache --show-stats
 
 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" --verbose --color=always
-    - sccache --stop-server
+    - sccache --show-stats
 
 cargo-check-evmbin:
   stage:                           test
   <<:                              *docker-cache-status
   script:
     - time cargo check -p evmbin --target $CARGO_TARGET --locked --verbose --color=always
-    - sccache -s
-
-cargo-check-evmbin:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - time cargo check -p evmbin --target $CARGO_TARGET --locked --verbose --color=always
-    - sccache -s
+    - sccache --show-stats
 
 cargo-check-benches:
   stage:                           test
   <<:                              *docker-cache-status
   script:
     - time cargo check --all --benches --target $CARGO_TARGET --locked --verbose --color=always
-    - sccache -s
+    - sccache --show-stats
 
 cargo-audit:
   stage:                           test

diff --git a/scripts/gitlab/build-linux.sh b/scripts/gitlab/build-linux.sh
@@ -13,15 +13,18 @@ echo "CC:               " $CC
 echo "CXX:              " $CXX
 #strip ON
 export RUSTFLAGS=" -C link-arg=-s"
-# Linker for crosscomile
-echo "_____ Linker _____"
-cat .cargo/config
 
 echo "_____ Building target: "$CARGO_TARGET" _____"
 if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ]
 then
   time cargo build --target $CARGO_TARGET --verbose --color=always --release -p parity-clib --features final
 else
+  if [ "${CARGO_TARGET}" = "x86_64-unknown-linux-gnu" ] || [ "${CARGO_TARGET}" = "x86_64-apple-darwin" ]
+  then
+    # NOTE: Enables the aes-ni instructions for RustCrypto dependency.
+    # If you change this please remember to also update .cargo/config
+    export RUSTFLAGS="$RUSTFLAGS -Ctarget-feature=+aes,+sse2,+ssse3"
+  fi
   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
@@ -53,8 +56,8 @@ do
   then
       ./parity tools hash $binary > $binary.sha3
   else
-      echo "> ${binary} cannot be hashed with cross-compiled binary (keccak256)"
+      echo ">[WARN] ${binary} cannot be hashed with cross-compiled binary (keccak256)"
   fi
 done
 #show sccache statistics
-sccache --stop-server
+sccache --show-stats