Skip to content
This repository was archived by the owner on Nov 6, 2020. It is now read-only.

Commit 9f94473

Browse files
General-Becks3krit
authored andcommitted
sccache --stop-server -> sccache --show-stats (#11255)
1 parent 42437fb commit 9f94473

File tree

2 files changed

+19
-17
lines changed

2 files changed

+19
-17
lines changed

.gitlab-ci.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ variables:
3737
before_script:
3838
- rustup show
3939
- cargo --version
40+
retry:
41+
max: 2
42+
when:
43+
- runner_system_failure
44+
- unknown_failure
45+
- api_failure
4046
tags:
4147
- linux-docker
4248

@@ -63,42 +69,35 @@ cargo-check 0 3:
6369
<<: *docker-cache-status
6470
script:
6571
- time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose --color=always
66-
- sccache --stop-server
72+
- sccache --show-stats
6773

6874
cargo-check 1 3:
6975
stage: test
7076
<<: *docker-cache-status
7177
script:
7278
- time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose --color=always
73-
- sccache --stop-server
79+
- sccache --show-stats
7480

7581
cargo-check 2 3:
7682
stage: test
7783
<<: *docker-cache-status
7884
script:
7985
- time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose --color=always
80-
- sccache --stop-server
86+
- sccache --show-stats
8187

8288
cargo-check-evmbin:
8389
stage: test
8490
<<: *docker-cache-status
8591
script:
8692
- time cargo check -p evmbin --target $CARGO_TARGET --locked --verbose --color=always
87-
- sccache -s
88-
89-
cargo-check-evmbin:
90-
stage: test
91-
<<: *docker-cache-status
92-
script:
93-
- time cargo check -p evmbin --target $CARGO_TARGET --locked --verbose --color=always
94-
- sccache -s
93+
- sccache --show-stats
9594

9695
cargo-check-benches:
9796
stage: test
9897
<<: *docker-cache-status
9998
script:
10099
- time cargo check --all --benches --target $CARGO_TARGET --locked --verbose --color=always
101-
- sccache -s
100+
- sccache --show-stats
102101

103102
cargo-audit:
104103
stage: test

scripts/gitlab/build-linux.sh

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,18 @@ echo "CC: " $CC
1313
echo "CXX: " $CXX
1414
#strip ON
1515
export RUSTFLAGS=" -C link-arg=-s"
16-
# Linker for crosscomile
17-
echo "_____ Linker _____"
18-
cat .cargo/config
1916

2017
echo "_____ Building target: "$CARGO_TARGET" _____"
2118
if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ]
2219
then
2320
time cargo build --target $CARGO_TARGET --verbose --color=always --release -p parity-clib --features final
2421
else
22+
if [ "${CARGO_TARGET}" = "x86_64-unknown-linux-gnu" ] || [ "${CARGO_TARGET}" = "x86_64-apple-darwin" ]
23+
then
24+
# NOTE: Enables the aes-ni instructions for RustCrypto dependency.
25+
# If you change this please remember to also update .cargo/config
26+
export RUSTFLAGS="$RUSTFLAGS -Ctarget-feature=+aes,+sse2,+ssse3"
27+
fi
2528
time cargo build --target $CARGO_TARGET --verbose --color=always --release --features final
2629
time cargo build --target $CARGO_TARGET --verbose --color=always --release -p evmbin
2730
time cargo build --target $CARGO_TARGET --verbose --color=always --release -p ethstore-cli
@@ -53,8 +56,8 @@ do
5356
then
5457
./parity tools hash $binary > $binary.sha3
5558
else
56-
echo "> ${binary} cannot be hashed with cross-compiled binary (keccak256)"
59+
echo ">[WARN] ${binary} cannot be hashed with cross-compiled binary (keccak256)"
5760
fi
5861
done
5962
#show sccache statistics
60-
sccache --stop-server
63+
sccache --show-stats

0 commit comments

Comments
 (0)