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

Commit 94164e1

Browse files
authored
stable ci: backport missing diff from master (#10662)
* ci: publish docs debug (#10638) * ci: backport missing diff from master
1 parent 9bb75d8 commit 94164e1

File tree

5 files changed

+18
-14
lines changed

5 files changed

+18
-14
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -290,4 +290,3 @@ publish-docs:
290290
tags:
291291
- linux-docker
292292
allow_failure: true
293-

scripts/gitlab/build-linux.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ cat .cargo/config
1818
echo "_____ Building target: "$CARGO_TARGET" _____"
1919
if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ]
2020
then
21-
time cargo build --target $CARGO_TARGET --release -p parity-clib --features final
21+
time cargo build --target $CARGO_TARGET --verbose --color=always --release -p parity-clib --features final
2222
else
23-
time cargo build --target $CARGO_TARGET --release --features final
24-
time cargo build --target $CARGO_TARGET --release -p evmbin
25-
time cargo build --target $CARGO_TARGET --release -p ethstore-cli
26-
time cargo build --target $CARGO_TARGET --release -p ethkey-cli
27-
time cargo build --target $CARGO_TARGET --release -p whisper-cli
23+
time cargo build --target $CARGO_TARGET --verbose --color=always --release --features final
24+
time cargo build --target $CARGO_TARGET --verbose --color=always --release -p evmbin
25+
time cargo build --target $CARGO_TARGET --verbose --color=always --release -p ethstore-cli
26+
time cargo build --target $CARGO_TARGET --verbose --color=always --release -p ethkey-cli
27+
time cargo build --target $CARGO_TARGET --verbose --color=always --release -p whisper-cli
2828
fi
2929

3030
echo "_____ Post-processing binaries _____"

scripts/gitlab/build-windows.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ echo "RUSTC_WRAPPER: " $RUSTC_WRAPPER
1414
echo "SCCACHE_DIR: " $SCCACHE_DIR
1515

1616
echo "_____ Building target: "$CARGO_TARGET" _____"
17-
time cargo build --target $CARGO_TARGET --release --features final
18-
time cargo build --target $CARGO_TARGET --release -p evmbin
19-
time cargo build --target $CARGO_TARGET --release -p ethstore-cli
20-
time cargo build --target $CARGO_TARGET --release -p ethkey-cli
21-
time cargo build --target $CARGO_TARGET --release -p whisper-cli
17+
time cargo build --target $CARGO_TARGET --verbose --release --features final
18+
time cargo build --target $CARGO_TARGET --verbose --release -p evmbin
19+
time cargo build --target $CARGO_TARGET --verbose --release -p ethstore-cli
20+
time cargo build --target $CARGO_TARGET --verbose --release -p ethkey-cli
21+
time cargo build --target $CARGO_TARGET --verbose --release -p whisper-cli
2222

2323
echo "__________Sign binaries__________"
2424
scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity.exe

scripts/gitlab/test-linux.sh

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#!/bin/bash
2+
# ARGUMENT $1 Rust flavor to run test with (stable/beta/nightly)
3+
24
echo "________Running test-linux.sh________"
35
set -e # fail on any error
46
set -u # treat unset variables as error
@@ -8,5 +10,8 @@ OPTIONS="--release"
810
#use nproc `linux only
911
THREADS=$(nproc)
1012

13+
rustup default $1
14+
rustup show
15+
1116
echo "________Running Parity Full Test Suite________"
12-
time cargo test $OPTIONS --features "$FEATURES" --locked --all --target $CARGO_TARGET -- --test-threads $THREADS
17+
time cargo test $OPTIONS --features "$FEATURES" --locked --all --target $CARGO_TARGET --verbose --color=always -- --test-threads $THREADS

scripts/gitlab/validate-chainspecs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ echo "________Running validate_chainspecs.sh________"
66
ERR=0
77

88
echo "________Validate chainspecs________"
9-
time cargo build --release -p chainspec
9+
time cargo build --release -p chainspec --verbose --color=always
1010

1111
for spec in ethcore/res/*.json; do
1212
if ! ./target/release/chainspec "$spec"; then ERR=1; fi

0 commit comments

Comments
 (0)