From 3438728e3c1a2693e37251bba9c562be54c44bde Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 8 Apr 2019 15:13:00 +0200 Subject: [PATCH 01/29] check if it was the file --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 436b8a156f5..944fdc4f3ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,9 +41,10 @@ variables: - 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 + - test -x sccache_error.log && grep CannotCache sccache_error.log | sed -re 's/.*CannotCache\((.+)\).*/\1/' | sort | uniq -c tags: - - linux-docker + # - linux-docker + - qa cargo-check 0 3: From 6b1c2131fc226b530cc0fcf09c92b22b26c56395 Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 8 Apr 2019 18:00:19 +0200 Subject: [PATCH 02/29] collect tog files --- .gitlab-ci.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 944fdc4f3ec..e5ba5c91c98 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -34,10 +34,19 @@ variables: .docker-cache-status: &docker-cache-status variables: CARGO_HOME: "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}" + artifacts: + name: "${CI_JOB_NAME}" + # when: on_failure + expire_in: 7 days + paths: + - artifacts/ before_script: - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache::server=debug sccache --start-server - sccache -s after_script: + # collect log files + - find . -name "*.log" | xargs tar --append -f ./artifacts/logs.tar + # sccache debug info - 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:" From c1ddc29400b79cc8d3145f6b4b40c15e851af6ae Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 8 Apr 2019 18:27:04 +0200 Subject: [PATCH 03/29] some debug --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e5ba5c91c98..8d9a04250d6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,13 +44,15 @@ variables: - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache::server=debug sccache --start-server - sccache -s after_script: - # collect log files - - find . -name "*.log" | xargs tar --append -f ./artifacts/logs.tar # sccache debug info - 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:" - test -x sccache_error.log && grep CannotCache sccache_error.log | sed -re 's/.*CannotCache\((.+)\).*/\1/' | sort | uniq -c + # collect log files + - pwd + - ls ./artifacts + - find . -name "*.log" | xargs tar --append -f ./artifacts/logs.tar tags: # - linux-docker - qa From d81b5ffdf4e36f6ee4d6b838c7659f3db8d22fb9 Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 8 Apr 2019 21:01:00 +0200 Subject: [PATCH 04/29] some more debug --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8d9a04250d6..ce99c472788 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,11 +48,14 @@ variables: - 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:" - - test -x sccache_error.log && grep CannotCache sccache_error.log | sed -re 's/.*CannotCache\((.+)\).*/\1/' | sort | uniq -c + - test -e sccache_error.log && + grep CannotCache sccache_error.log | sed -re 's/.*CannotCache\((.+)\).*/\1/' | sort | uniq -c || true # collect log files - pwd + - find . -name "*.log" + - find . -name "*.log" | xargs tar --append -f ./artifacts/logs.tar + - echo "ls artifacts" - ls ./artifacts - - find . -name "*.log" | xargs tar --append -f ./artifacts/logs.tar tags: # - linux-docker - qa From ab70b21eadf51cd1c314be7a3fcf48abdf00eeba Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 8 Apr 2019 21:27:38 +0200 Subject: [PATCH 05/29] some even more debug --- .gitlab-ci.yml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ce99c472788..8486742483e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,11 +45,16 @@ variables: - sccache -s after_script: # sccache debug info - - 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:" - - test -e sccache_error.log && - grep CannotCache sccache_error.log | sed -re 's/.*CannotCache\((.+)\).*/\1/' | sort | uniq -c || true + - if test -e sccache_error.log; + then + 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; + else + echo "No logs from sccache"; + exit 0; + fi # collect log files - pwd - find . -name "*.log" From 408c54ac9062253959bf3c29e94048f9b087014e Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 8 Apr 2019 21:50:34 +0200 Subject: [PATCH 06/29] upload all the logs --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8486742483e..280ff48af8b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,11 +56,9 @@ variables: exit 0; fi # collect log files - - pwd + - mkdir -p ./artifacts - find . -name "*.log" - find . -name "*.log" | xargs tar --append -f ./artifacts/logs.tar - - echo "ls artifacts" - - ls ./artifacts tags: # - linux-docker - qa From ced077dda77cb5f3d9e1a3cc3a6cbe29d316b4be Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 8 Apr 2019 22:33:52 +0200 Subject: [PATCH 07/29] change cache max size --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 280ff48af8b..1599dadf348 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,12 +36,14 @@ variables: CARGO_HOME: "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}" artifacts: name: "${CI_JOB_NAME}" - # when: on_failure expire_in: 7 days paths: - artifacts/ before_script: - - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache::server=debug sccache --start-server + - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log + RUST_LOG=sccache::server=debug + SCCACHE_CACHE_SIZE=50G + sccache --start-server - sccache -s after_script: # sccache debug info From 6cd66f994d0c3430dead68baff099411447cbe79 Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 8 Apr 2019 23:20:59 +0200 Subject: [PATCH 08/29] test with max cache size overflow --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1599dadf348..ed9ebc41c35 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ variables: before_script: - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache::server=debug - SCCACHE_CACHE_SIZE=50G + SCCACHE_CACHE_SIZE=5G sccache --start-server - sccache -s after_script: From 8f66f21c9689e0f5ace7cd5df1d8bba7608ac654 Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 8 Apr 2019 23:43:00 +0200 Subject: [PATCH 09/29] verbose for all cargo jobs --- .gitlab-ci.yml | 6 +++--- parity-clib/examples/cpp/CMakeLists.txt | 4 ++-- scripts/gitlab/build-linux.sh | 12 ++++++------ scripts/gitlab/build-windows.sh | 10 +++++----- scripts/gitlab/test-linux.sh | 2 +- scripts/gitlab/validate-chainspecs.sh | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed9ebc41c35..43f2eb9e078 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,21 +70,21 @@ cargo-check 0 3: stage: test <<: *docker-cache-status script: - - time cargo check --target $CARGO_TARGET --locked --no-default-features + - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose - 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 + - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose - 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" + - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose - sccache -s cargo-audit: diff --git a/parity-clib/examples/cpp/CMakeLists.txt b/parity-clib/examples/cpp/CMakeLists.txt index 8cc6aef8f5c..9df07c8f442 100644 --- a/parity-clib/examples/cpp/CMakeLists.txt +++ b/parity-clib/examples/cpp/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) include(ExternalProject) include_directories("${CMAKE_SOURCE_DIR}/../..") -set (CMAKE_CXX_STANDARD 11) # Enfore C++11 +set (CMAKE_CXX_STANDARD 11) # Enforce C++11 add_executable(parity-example main.cpp) ExternalProject_Add( @@ -9,7 +9,7 @@ ExternalProject_Add( DOWNLOAD_COMMAND "" CONFIGURE_COMMAND "" BUILD_COMMAND "" - COMMAND cargo build -p parity-clib # Note: use --release in a real project + COMMAND cargo build -p parity-clib --verbose # Note: use --release in a real project BINARY_DIR "${CMAKE_SOURCE_DIR}/../../../target" INSTALL_COMMAND "" LOG_BUILD ON) diff --git a/scripts/gitlab/build-linux.sh b/scripts/gitlab/build-linux.sh index f0697080cb8..8ade5b46157 100755 --- a/scripts/gitlab/build-linux.sh +++ b/scripts/gitlab/build-linux.sh @@ -18,13 +18,13 @@ cat .cargo/config echo "_____ Building target: "$CARGO_TARGET" _____" if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ] then - time cargo build --target $CARGO_TARGET --release -p parity-clib --features final + time cargo build --target $CARGO_TARGET --verbose --release -p parity-clib --features final else - time cargo build --target $CARGO_TARGET --release --features final - time cargo build --target $CARGO_TARGET --release -p evmbin - time cargo build --target $CARGO_TARGET --release -p ethstore-cli - time cargo build --target $CARGO_TARGET --release -p ethkey-cli - time cargo build --target $CARGO_TARGET --release -p whisper-cli + time cargo build --target $CARGO_TARGET --verbose --release --features final + time cargo build --target $CARGO_TARGET --verbose --release -p evmbin + time cargo build --target $CARGO_TARGET --verbose --release -p ethstore-cli + time cargo build --target $CARGO_TARGET --verbose --release -p ethkey-cli + time cargo build --target $CARGO_TARGET --verbose --release -p whisper-cli fi echo "_____ Post-processing binaries _____" diff --git a/scripts/gitlab/build-windows.sh b/scripts/gitlab/build-windows.sh index 7ddf4453e50..76332124d1d 100755 --- a/scripts/gitlab/build-windows.sh +++ b/scripts/gitlab/build-windows.sh @@ -14,11 +14,11 @@ echo "RUSTC_WRAPPER: " $RUSTC_WRAPPER echo "SCCACHE_DIR: " $SCCACHE_DIR echo "_____ Building target: "$CARGO_TARGET" _____" -time cargo build --target $CARGO_TARGET --release --features final -time cargo build --target $CARGO_TARGET --release -p evmbin -time cargo build --target $CARGO_TARGET --release -p ethstore-cli -time cargo build --target $CARGO_TARGET --release -p ethkey-cli -time cargo build --target $CARGO_TARGET --release -p whisper-cli +time cargo build --target $CARGO_TARGET --verbose --release --features final +time cargo build --target $CARGO_TARGET --verbose --release -p evmbin +time cargo build --target $CARGO_TARGET --verbose --release -p ethstore-cli +time cargo build --target $CARGO_TARGET --verbose --release -p ethkey-cli +time cargo build --target $CARGO_TARGET --verbose --release -p whisper-cli echo "__________Sign binaries__________" scripts/gitlab/sign-win.cmd $keyfile $certpass target/$CARGO_TARGET/release/parity.exe diff --git a/scripts/gitlab/test-linux.sh b/scripts/gitlab/test-linux.sh index 6a98d2f7bd5..a64315a11e7 100755 --- a/scripts/gitlab/test-linux.sh +++ b/scripts/gitlab/test-linux.sh @@ -9,4 +9,4 @@ OPTIONS="--release" THREADS=$(nproc) echo "________Running Parity Full Test Suite________" -time cargo test $OPTIONS --features "$FEATURES" --locked --all --target $CARGO_TARGET -- --test-threads $THREADS +time cargo test $OPTIONS --features "$FEATURES" --locked --all --target $CARGO_TARGET --verbose -- --test-threads $THREADS diff --git a/scripts/gitlab/validate-chainspecs.sh b/scripts/gitlab/validate-chainspecs.sh index 9b7ef39e727..7954f0b6354 100755 --- a/scripts/gitlab/validate-chainspecs.sh +++ b/scripts/gitlab/validate-chainspecs.sh @@ -6,7 +6,7 @@ echo "________Running validate_chainspecs.sh________" ERR=0 echo "________Validate chainspecs________" -time cargo build --release -p chainspec +time cargo build --release -p chainspec --verbose for spec in ethcore/res/*.json; do if ! ./target/release/chainspec "$spec"; then ERR=1; fi From fe90bc5bb337ef9bf89a661e1863cb01c630cc4d Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 8 Apr 2019 23:56:45 +0200 Subject: [PATCH 10/29] lower max cache size --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 43f2eb9e078..c51c8e536bc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -42,7 +42,7 @@ variables: before_script: - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache::server=debug - SCCACHE_CACHE_SIZE=5G + SCCACHE_CACHE_SIZE=3G sccache --start-server - sccache -s after_script: From 099c73a967f6623f5cecc3c82c288bbcc9104e67 Mon Sep 17 00:00:00 2001 From: Denis P Date: Tue, 9 Apr 2019 18:07:01 +0200 Subject: [PATCH 11/29] Rust nightly and beta test runs reintroduced --- .gitlab-ci.yml | 19 ++++++++++++++++++- scripts/gitlab/test-linux.sh | 5 +++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c51c8e536bc..9cacf8825dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,9 +112,26 @@ test-linux: stage: build <<: *docker-cache-status script: - - ./scripts/gitlab/test-linux.sh + - ./scripts/gitlab/test-linux.sh stable - sccache -s +test-linux-beta: + stage: build + # only: *releaseable_branches + <<: *docker-cache-status + script: + - ./scripts/gitlab/test-linux.sh beta + - sccache -s + +test-linux-nightly: + stage: build + # only: *releaseable_branches + <<: *docker-cache-status + script: + - ./scripts/gitlab/test-linux.sh nightly + - sccache -s + allow_failure: true + build-android: stage: build image: parity/rust-parity-ethereum-android-build:stretch diff --git a/scripts/gitlab/test-linux.sh b/scripts/gitlab/test-linux.sh index a64315a11e7..dd4acdbfdb1 100755 --- a/scripts/gitlab/test-linux.sh +++ b/scripts/gitlab/test-linux.sh @@ -1,4 +1,6 @@ #!/bin/bash +# ARGUMENT $1 Rust flavor to run test with (stable/beta/nightly) + echo "________Running test-linux.sh________" set -e # fail on any error set -u # treat unset variables as error @@ -8,5 +10,8 @@ OPTIONS="--release" #use nproc `linux only THREADS=$(nproc) +rustup default $1 +rustup show + echo "________Running Parity Full Test Suite________" time cargo test $OPTIONS --features "$FEATURES" --locked --all --target $CARGO_TARGET --verbose -- --test-threads $THREADS From 1c9834f20c61fa25629739419d5ad49b98fcfe37 Mon Sep 17 00:00:00 2001 From: Denis P Date: Tue, 9 Apr 2019 18:44:21 +0200 Subject: [PATCH 12/29] artifacts:when: always, coz on_success is default --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9cacf8825dd..1625a077b7b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,6 +36,7 @@ variables: CARGO_HOME: "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}" artifacts: name: "${CI_JOB_NAME}" + when: always expire_in: 7 days paths: - artifacts/ From 7b857b2caa4c6da1e94ecd375e4aa2e7ab2740b7 Mon Sep 17 00:00:00 2001 From: Denis P Date: Tue, 9 Apr 2019 20:05:45 +0200 Subject: [PATCH 13/29] sccache full log --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1625a077b7b..c58a1d707a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,8 +41,9 @@ variables: paths: - artifacts/ before_script: + # RUST_LOG=sccache::server=debug - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log - RUST_LOG=sccache::server=debug + RUST_LOG=sccache SCCACHE_CACHE_SIZE=3G sccache --start-server - sccache -s From 44263456504ec73fc6439497a9743c0a5eb5c621 Mon Sep 17 00:00:00 2001 From: Denis P Date: Tue, 9 Apr 2019 20:53:04 +0200 Subject: [PATCH 14/29] normal artifacts name, big cache size --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c58a1d707a6..ac09df8389d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ variables: variables: CARGO_HOME: "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}" artifacts: - name: "${CI_JOB_NAME}" + name: "${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" when: always expire_in: 7 days paths: @@ -44,7 +44,7 @@ variables: # RUST_LOG=sccache::server=debug - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache - SCCACHE_CACHE_SIZE=3G + SCCACHE_CACHE_SIZE=50G sccache --start-server - sccache -s after_script: From ce7f9c9d0ced0eab8093c56b79ea6d82db8003f0 Mon Sep 17 00:00:00 2001 From: Denis P Date: Wed, 10 Apr 2019 12:19:46 +0200 Subject: [PATCH 15/29] add file to test the compilation again --- parity/delme.rs | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 parity/delme.rs diff --git a/parity/delme.rs b/parity/delme.rs new file mode 100644 index 00000000000..e69de29bb2d From 3d896fbc4fd5769f05818409328c9c61880da1e1 Mon Sep 17 00:00:00 2001 From: Denis P Date: Wed, 10 Apr 2019 14:38:49 +0200 Subject: [PATCH 16/29] another way of getting artifacts --- .gitlab-ci.yml | 8 ++++---- parity/delme.rs | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ac09df8389d..8722acb73a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,7 +39,7 @@ variables: when: always expire_in: 7 days paths: - - artifacts/ + - "*.log" before_script: # RUST_LOG=sccache::server=debug - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log @@ -60,9 +60,9 @@ variables: exit 0; fi # collect log files - - mkdir -p ./artifacts - - find . -name "*.log" - - find . -name "*.log" | xargs tar --append -f ./artifacts/logs.tar + # - mkdir -p ./artifacts + # - find . -name "*.log" + # - find . -name "*.log" | xargs tar --append -f ./artifacts/logs.tar tags: # - linux-docker - qa diff --git a/parity/delme.rs b/parity/delme.rs index e69de29bb2d..83a7c5c440b 100644 --- a/parity/delme.rs +++ b/parity/delme.rs @@ -0,0 +1 @@ +# someshit From 4edeb41f04609d5b0536bc342136738eca54e462 Mon Sep 17 00:00:00 2001 From: Denis P Date: Wed, 10 Apr 2019 16:55:22 +0200 Subject: [PATCH 17/29] per-job cache --- .gitlab-ci.yml | 9 +++++---- parity/delme.rs | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8722acb73a9..2e2be9fe75a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,12 +39,13 @@ variables: when: always expire_in: 7 days paths: - - "*.log" + - artifacts/ before_script: # RUST_LOG=sccache::server=debug - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache SCCACHE_CACHE_SIZE=50G + SCCACHE_DIR=/ci-cache/parity-ethereum/sccache/${CI_JOB_NAME} sccache --start-server - sccache -s after_script: @@ -60,9 +61,9 @@ variables: exit 0; fi # collect log files - # - mkdir -p ./artifacts - # - find . -name "*.log" - # - find . -name "*.log" | xargs tar --append -f ./artifacts/logs.tar + - mkdir -p ./artifacts + - find . -name "*.log" + - find . -name "*.log" | xargs tar --append -f ./artifacts/logs.tar tags: # - linux-docker - qa diff --git a/parity/delme.rs b/parity/delme.rs index 83a7c5c440b..4801d0d4d69 100644 --- a/parity/delme.rs +++ b/parity/delme.rs @@ -1 +1,2 @@ # someshit +# even more From f6b5afec7b8b6f29643830fa7f52d4bf8783eee8 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 11 Apr 2019 10:08:50 +0200 Subject: [PATCH 18/29] data race tests --- .gitlab-ci.yml | 10 +++++----- parity/delme.rs | 2 -- 2 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 parity/delme.rs diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e2be9fe75a..81313acd88c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -41,15 +41,17 @@ variables: paths: - artifacts/ before_script: - # RUST_LOG=sccache::server=debug + # save just logs from sccache server: RUST_LOG=sccache::server=debug + # set SCCACHE_DIR per job name to avoid data race condition until it'll be fixed - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log - RUST_LOG=sccache + RUST_LOG=sccache::server=trace SCCACHE_CACHE_SIZE=50G SCCACHE_DIR=/ci-cache/parity-ethereum/sccache/${CI_JOB_NAME} sccache --start-server - sccache -s after_script: # sccache debug info + - echo "sccache --show-stats" - if test -e sccache_error.log; then echo "All crate-types:"; @@ -65,9 +67,7 @@ variables: - find . -name "*.log" - find . -name "*.log" | xargs tar --append -f ./artifacts/logs.tar tags: - # - linux-docker - - qa - + - linux-docker cargo-check 0 3: stage: test diff --git a/parity/delme.rs b/parity/delme.rs deleted file mode 100644 index 4801d0d4d69..00000000000 --- a/parity/delme.rs +++ /dev/null @@ -1,2 +0,0 @@ -# someshit -# even more From cb07626a29b13330a224cb3e86e2639ff8431120 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 11 Apr 2019 10:42:15 +0200 Subject: [PATCH 19/29] is it needed to clean the working folder? --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 81313acd88c..58ee8cf9739 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,6 +43,9 @@ variables: before_script: # save just logs from sccache server: RUST_LOG=sccache::server=debug # set SCCACHE_DIR per job name to avoid data race condition until it'll be fixed + - git status + - ls -l + # ^^ debug - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache::server=trace SCCACHE_CACHE_SIZE=50G From f085448f5689a8bd833697850015bbfda51b3501 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 11 Apr 2019 12:01:05 +0200 Subject: [PATCH 20/29] return to common cache dir --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 58ee8cf9739..d968f1121a1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,18 +43,21 @@ variables: before_script: # save just logs from sccache server: RUST_LOG=sccache::server=debug # set SCCACHE_DIR per job name to avoid data race condition until it'll be fixed + # SCCACHE_DIR=/ci-cache/parity-ethereum/sccache/${CI_JOB_NAME} - git status - ls -l + - find . -name "*.log" # ^^ debug - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache::server=trace SCCACHE_CACHE_SIZE=50G - SCCACHE_DIR=/ci-cache/parity-ethereum/sccache/${CI_JOB_NAME} + SCCACHE_DIR=/ci-cache/parity-ethereum/sccache/ sccache --start-server - sccache -s after_script: # sccache debug info - - echo "sccache --show-stats" + - echo "after script sccache --show-stats" + - sccache -s - if test -e sccache_error.log; then echo "All crate-types:"; From 5377f48b2407e2e0b516c72f310d40aef7de389e Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 11 Apr 2019 16:44:49 +0200 Subject: [PATCH 21/29] do not pass logs between jobs --- .gitlab-ci.yml | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d968f1121a1..e0f8ff83155 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -31,39 +31,40 @@ variables: paths: - artifacts/ -.docker-cache-status: &docker-cache-status - variables: - CARGO_HOME: "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}" +.collect_logs: &collect_logs artifacts: name: "${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" when: always expire_in: 7 days paths: - - artifacts/ + - logs/ + +.docker-cache-status: &docker-cache-status + variables: + CARGO_HOME: "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}" + <<: *collect_logs + dependencies: [] before_script: - # save just logs from sccache server: RUST_LOG=sccache::server=debug - # set SCCACHE_DIR per job name to avoid data race condition until it'll be fixed - # SCCACHE_DIR=/ci-cache/parity-ethereum/sccache/${CI_JOB_NAME} - git status - ls -l - find . -name "*.log" # ^^ debug - - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log - RUST_LOG=sccache::server=trace + - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_debug.log + RUST_LOG=sccache::server=debug SCCACHE_CACHE_SIZE=50G SCCACHE_DIR=/ci-cache/parity-ethereum/sccache/ sccache --start-server - sccache -s after_script: # sccache debug info - - echo "after script sccache --show-stats" + - sccache --start-server - sccache -s - - if test -e sccache_error.log; + - if test -e sccache_debug.log; then echo "All crate-types:"; - grep 'parse_arguments.*--crate-type' sccache_error.log | sed -re 's/.*"--crate-type", "([^"]+)".*/\1/' | sort | uniq -c; + grep 'parse_arguments.*--crate-type' sccache_debug.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; + grep CannotCache sccache_debug.log | sed -re 's/.*CannotCache\((.+)\).*/\1/' | sort | uniq -c; else echo "No logs from sccache"; exit 0; @@ -71,7 +72,7 @@ variables: # collect log files - mkdir -p ./artifacts - find . -name "*.log" - - find . -name "*.log" | xargs tar --append -f ./artifacts/logs.tar + - find . -name "*.log" | xargs tar --append -f ./logs/logs_"${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}".tar tags: - linux-docker From df4e501b90546c6e0def962b1a66ec990d0f67d2 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 11 Apr 2019 16:50:14 +0200 Subject: [PATCH 22/29] typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0f8ff83155..d82408c3162 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -70,7 +70,7 @@ variables: exit 0; fi # collect log files - - mkdir -p ./artifacts + - mkdir -p ./logs - find . -name "*.log" - find . -name "*.log" | xargs tar --append -f ./logs/logs_"${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}".tar tags: From 4ad7933132cf299ce6d417e2801f95702214b667 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 11 Apr 2019 17:20:39 +0200 Subject: [PATCH 23/29] avoid artifacts conflict --- .gitlab-ci.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d82408c3162..1d9538666a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,18 +37,13 @@ variables: when: always expire_in: 7 days paths: - - logs/ + - artifacts/ .docker-cache-status: &docker-cache-status variables: CARGO_HOME: "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}" - <<: *collect_logs dependencies: [] before_script: - - git status - - ls -l - - find . -name "*.log" - # ^^ debug - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_debug.log RUST_LOG=sccache::server=debug SCCACHE_CACHE_SIZE=50G @@ -57,8 +52,6 @@ variables: - sccache -s after_script: # sccache debug info - - sccache --start-server - - sccache -s - if test -e sccache_debug.log; then echo "All crate-types:"; @@ -70,15 +63,16 @@ variables: exit 0; fi # collect log files - - mkdir -p ./logs + - mkdir -p ./artifacts - find . -name "*.log" - - find . -name "*.log" | xargs tar --append -f ./logs/logs_"${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}".tar + - find . -name "*.log" | xargs tar --append -f ./artifacts/logs_"${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}".tar tags: - linux-docker cargo-check 0 3: stage: test <<: *docker-cache-status + <<: *collect_logs script: - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose - sccache -s @@ -86,6 +80,7 @@ cargo-check 0 3: cargo-check 1 3: stage: test <<: *docker-cache-status + <<: *collect_logs script: - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose - sccache -s @@ -93,6 +88,7 @@ cargo-check 1 3: cargo-check 2 3: stage: test <<: *docker-cache-status + <<: *collect_logs script: - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose - sccache -s @@ -107,6 +103,7 @@ cargo-audit: validate-chainspecs: stage: test <<: *docker-cache-status + <<: *collect_logs script: - ./scripts/gitlab/validate-chainspecs.sh - sccache -s @@ -114,6 +111,7 @@ validate-chainspecs: test-cpp: stage: build <<: *docker-cache-status + <<: *collect_logs script: - ./scripts/gitlab/test-cpp.sh - sccache -s @@ -121,6 +119,7 @@ test-cpp: test-linux: stage: build <<: *docker-cache-status + <<: *collect_logs script: - ./scripts/gitlab/test-linux.sh stable - sccache -s @@ -129,6 +128,7 @@ test-linux-beta: stage: build # only: *releaseable_branches <<: *docker-cache-status + <<: *collect_logs script: - ./scripts/gitlab/test-linux.sh beta - sccache -s @@ -137,6 +137,7 @@ test-linux-nightly: stage: build # only: *releaseable_branches <<: *docker-cache-status + <<: *collect_logs script: - ./scripts/gitlab/test-linux.sh nightly - sccache -s @@ -156,7 +157,7 @@ build-android: build-linux: &build-linux stage: build - only: *releaseable_branches + # only: *releaseable_branches <<: *docker-cache-status <<: *collect_artifacts script: From 3626c84affe95d51f23c51e0b2cd94d7d3054605 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 11 Apr 2019 17:44:55 +0200 Subject: [PATCH 24/29] colored logs --- .gitlab-ci.yml | 7 +++---- parity-clib/examples/cpp/CMakeLists.txt | 2 +- scripts/gitlab/build-linux.sh | 12 ++++++------ scripts/gitlab/test-linux.sh | 2 +- scripts/gitlab/validate-chainspecs.sh | 2 +- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1d9538666a6..83e57e8a7bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,7 +74,7 @@ cargo-check 0 3: <<: *docker-cache-status <<: *collect_logs script: - - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose + - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose --color=auto - sccache -s cargo-check 1 3: @@ -82,7 +82,7 @@ cargo-check 1 3: <<: *docker-cache-status <<: *collect_logs script: - - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose + - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose --color=auto - sccache -s cargo-check 2 3: @@ -90,7 +90,7 @@ cargo-check 2 3: <<: *docker-cache-status <<: *collect_logs script: - - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose + - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose --color=auto - sccache -s cargo-audit: @@ -98,7 +98,6 @@ cargo-audit: <<: *docker-cache-status script: - cargo audit - - sccache -s validate-chainspecs: stage: test diff --git a/parity-clib/examples/cpp/CMakeLists.txt b/parity-clib/examples/cpp/CMakeLists.txt index 9df07c8f442..b69333434c7 100644 --- a/parity-clib/examples/cpp/CMakeLists.txt +++ b/parity-clib/examples/cpp/CMakeLists.txt @@ -9,7 +9,7 @@ ExternalProject_Add( DOWNLOAD_COMMAND "" CONFIGURE_COMMAND "" BUILD_COMMAND "" - COMMAND cargo build -p parity-clib --verbose # Note: use --release in a real project + COMMAND cargo build -p parity-clib --verbose --color=auto # Note: use --release in a real project BINARY_DIR "${CMAKE_SOURCE_DIR}/../../../target" INSTALL_COMMAND "" LOG_BUILD ON) diff --git a/scripts/gitlab/build-linux.sh b/scripts/gitlab/build-linux.sh index 8ade5b46157..d6dad3d83c4 100755 --- a/scripts/gitlab/build-linux.sh +++ b/scripts/gitlab/build-linux.sh @@ -18,13 +18,13 @@ cat .cargo/config echo "_____ Building target: "$CARGO_TARGET" _____" if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ] then - time cargo build --target $CARGO_TARGET --verbose --release -p parity-clib --features final + time cargo build --target $CARGO_TARGET --verbose --color=auto --release -p parity-clib --features final else - time cargo build --target $CARGO_TARGET --verbose --release --features final - time cargo build --target $CARGO_TARGET --verbose --release -p evmbin - time cargo build --target $CARGO_TARGET --verbose --release -p ethstore-cli - time cargo build --target $CARGO_TARGET --verbose --release -p ethkey-cli - time cargo build --target $CARGO_TARGET --verbose --release -p whisper-cli + time cargo build --target $CARGO_TARGET --verbose --color=auto --release --features final + time cargo build --target $CARGO_TARGET --verbose --color=auto --release -p evmbin + time cargo build --target $CARGO_TARGET --verbose --color=auto --release -p ethstore-cli + time cargo build --target $CARGO_TARGET --verbose --color=auto --release -p ethkey-cli + time cargo build --target $CARGO_TARGET --verbose --color=auto --release -p whisper-cli fi echo "_____ Post-processing binaries _____" diff --git a/scripts/gitlab/test-linux.sh b/scripts/gitlab/test-linux.sh index dd4acdbfdb1..a7f0ffc6ada 100755 --- a/scripts/gitlab/test-linux.sh +++ b/scripts/gitlab/test-linux.sh @@ -14,4 +14,4 @@ rustup default $1 rustup show echo "________Running Parity Full Test Suite________" -time cargo test $OPTIONS --features "$FEATURES" --locked --all --target $CARGO_TARGET --verbose -- --test-threads $THREADS +time cargo test $OPTIONS --features "$FEATURES" --locked --all --target $CARGO_TARGET --verbose --color=auto -- --test-threads $THREADS diff --git a/scripts/gitlab/validate-chainspecs.sh b/scripts/gitlab/validate-chainspecs.sh index 7954f0b6354..1f20a61e006 100755 --- a/scripts/gitlab/validate-chainspecs.sh +++ b/scripts/gitlab/validate-chainspecs.sh @@ -6,7 +6,7 @@ echo "________Running validate_chainspecs.sh________" ERR=0 echo "________Validate chainspecs________" -time cargo build --release -p chainspec --verbose +time cargo build --release -p chainspec --verbose --color=auto for spec in ethcore/res/*.json; do if ! ./target/release/chainspec "$spec"; then ERR=1; fi From d7bbc18e27eb4d8961f0e61247b37cdaf6b1ac48 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 11 Apr 2019 17:55:32 +0200 Subject: [PATCH 25/29] always colored logs --- .gitlab-ci.yml | 6 +++--- parity-clib/examples/cpp/CMakeLists.txt | 2 +- scripts/gitlab/build-linux.sh | 12 ++++++------ scripts/gitlab/test-linux.sh | 2 +- scripts/gitlab/validate-chainspecs.sh | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 83e57e8a7bf..bb90e2ee292 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -74,7 +74,7 @@ cargo-check 0 3: <<: *docker-cache-status <<: *collect_logs script: - - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose --color=auto + - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose --color=always - sccache -s cargo-check 1 3: @@ -82,7 +82,7 @@ cargo-check 1 3: <<: *docker-cache-status <<: *collect_logs script: - - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose --color=auto + - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose --color=always - sccache -s cargo-check 2 3: @@ -90,7 +90,7 @@ cargo-check 2 3: <<: *docker-cache-status <<: *collect_logs script: - - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose --color=auto + - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose --color=always - sccache -s cargo-audit: diff --git a/parity-clib/examples/cpp/CMakeLists.txt b/parity-clib/examples/cpp/CMakeLists.txt index b69333434c7..28c6241d46c 100644 --- a/parity-clib/examples/cpp/CMakeLists.txt +++ b/parity-clib/examples/cpp/CMakeLists.txt @@ -9,7 +9,7 @@ ExternalProject_Add( DOWNLOAD_COMMAND "" CONFIGURE_COMMAND "" BUILD_COMMAND "" - COMMAND cargo build -p parity-clib --verbose --color=auto # Note: use --release in a real project + COMMAND cargo build -p parity-clib --verbose --color=always # Note: use --release in a real project BINARY_DIR "${CMAKE_SOURCE_DIR}/../../../target" INSTALL_COMMAND "" LOG_BUILD ON) diff --git a/scripts/gitlab/build-linux.sh b/scripts/gitlab/build-linux.sh index d6dad3d83c4..ebd65cd9b39 100755 --- a/scripts/gitlab/build-linux.sh +++ b/scripts/gitlab/build-linux.sh @@ -18,13 +18,13 @@ cat .cargo/config echo "_____ Building target: "$CARGO_TARGET" _____" if [ "${CARGO_TARGET}" = "armv7-linux-androideabi" ] then - time cargo build --target $CARGO_TARGET --verbose --color=auto --release -p parity-clib --features final + time cargo build --target $CARGO_TARGET --verbose --color=always --release -p parity-clib --features final else - time cargo build --target $CARGO_TARGET --verbose --color=auto --release --features final - time cargo build --target $CARGO_TARGET --verbose --color=auto --release -p evmbin - time cargo build --target $CARGO_TARGET --verbose --color=auto --release -p ethstore-cli - time cargo build --target $CARGO_TARGET --verbose --color=auto --release -p ethkey-cli - time cargo build --target $CARGO_TARGET --verbose --color=auto --release -p whisper-cli + 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 + time cargo build --target $CARGO_TARGET --verbose --color=always --release -p ethkey-cli + time cargo build --target $CARGO_TARGET --verbose --color=always --release -p whisper-cli fi echo "_____ Post-processing binaries _____" diff --git a/scripts/gitlab/test-linux.sh b/scripts/gitlab/test-linux.sh index a7f0ffc6ada..2854508bb56 100755 --- a/scripts/gitlab/test-linux.sh +++ b/scripts/gitlab/test-linux.sh @@ -14,4 +14,4 @@ rustup default $1 rustup show echo "________Running Parity Full Test Suite________" -time cargo test $OPTIONS --features "$FEATURES" --locked --all --target $CARGO_TARGET --verbose --color=auto -- --test-threads $THREADS +time cargo test $OPTIONS --features "$FEATURES" --locked --all --target $CARGO_TARGET --verbose --color=always -- --test-threads $THREADS diff --git a/scripts/gitlab/validate-chainspecs.sh b/scripts/gitlab/validate-chainspecs.sh index 1f20a61e006..58391e13126 100755 --- a/scripts/gitlab/validate-chainspecs.sh +++ b/scripts/gitlab/validate-chainspecs.sh @@ -6,7 +6,7 @@ echo "________Running validate_chainspecs.sh________" ERR=0 echo "________Validate chainspecs________" -time cargo build --release -p chainspec --verbose --color=auto +time cargo build --release -p chainspec --verbose --color=always for spec in ethcore/res/*.json; do if ! ./target/release/chainspec "$spec"; then ERR=1; fi From 06aa020a018164412f3573382efa040d4a429c96 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 11 Apr 2019 20:01:17 +0200 Subject: [PATCH 26/29] proper stages --- .gitlab-ci.yml | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb90e2ee292..8a93750d505 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,7 +125,7 @@ test-linux: test-linux-beta: stage: build - # only: *releaseable_branches + only: *releaseable_branches <<: *docker-cache-status <<: *collect_logs script: @@ -134,7 +134,7 @@ test-linux-beta: test-linux-nightly: stage: build - # only: *releaseable_branches + only: *releaseable_branches <<: *docker-cache-status <<: *collect_logs script: @@ -142,52 +142,51 @@ test-linux-nightly: - sccache -s allow_failure: true -build-android: +.build-on-linux: &build-on-linux stage: build - image: parity/rust-parity-ethereum-android-build:stretch - variables: - CARGO_TARGET: armv7-linux-androideabi - <<: *docker-cache-status - <<: *collect_artifacts - script: - - scripts/gitlab/build-linux.sh - tags: - - linux-docker - -build-linux: &build-linux - stage: build - # only: *releaseable_branches <<: *docker-cache-status <<: *collect_artifacts script: - scripts/gitlab/build-linux.sh - sccache -s +build-linux: + <<: *build-on-linux + +build-android: + <<: *build-on-linux + image: parity/rust-parity-ethereum-android-build:stretch + variables: + CARGO_TARGET: armv7-linux-androideabi + build-linux-i386: - <<: *build-linux + <<: *build-on-linux + only: *releaseable_branches image: parity/rust-parity-ethereum-build:i386 variables: CARGO_TARGET: i686-unknown-linux-gnu build-linux-arm64: - <<: *build-linux + <<: *build-on-linux + only: *releaseable_branches image: parity/rust-parity-ethereum-build:arm64 variables: CARGO_TARGET: aarch64-unknown-linux-gnu build-linux-armhf: - <<: *build-linux + <<: *build-on-linux + only: *releaseable_branches image: parity/rust-parity-ethereum-build:armhf variables: CARGO_TARGET: armv7-unknown-linux-gnueabihf build-darwin: stage: build - only: *releaseable_branches <<: *collect_artifacts + only: *releaseable_branches variables: CARGO_TARGET: x86_64-apple-darwin - CARGO_HOME: "${CI_PROJECT_DIR}/.cargo" + CARGO_HOME: "${CI_PROJECT_DIR}/.cargo" CC: gcc CXX: g++ script: From 85a79113e0c2f3abcda365650a50457929dcda2f Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 11 Apr 2019 20:08:18 +0200 Subject: [PATCH 27/29] more proper stages skip-ci --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8a93750d505..0cde31c516c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -150,15 +150,16 @@ test-linux-nightly: - scripts/gitlab/build-linux.sh - sccache -s -build-linux: - <<: *build-on-linux - build-android: <<: *build-on-linux image: parity/rust-parity-ethereum-android-build:stretch variables: CARGO_TARGET: armv7-linux-androideabi +build-linux: + <<: *build-on-linux + only: *releaseable_branches + build-linux-i386: <<: *build-on-linux only: *releaseable_branches From 61587035bd78b6d660f0d85294036dcd3dfd5300 Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 11 Apr 2019 21:47:03 +0200 Subject: [PATCH 28/29] more proper stages [skip-ci] --- .gitlab-ci.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0cde31c516c..9b5fa9ce79a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,6 +69,14 @@ variables: tags: - linux-docker +.build-on-linux: &build-on-linux + stage: build + <<: *docker-cache-status + <<: *collect_artifacts + script: + - scripts/gitlab/build-linux.sh + - sccache -s + cargo-check 0 3: stage: test <<: *docker-cache-status @@ -142,14 +150,6 @@ test-linux-nightly: - sccache -s allow_failure: true -.build-on-linux: &build-on-linux - stage: build - <<: *docker-cache-status - <<: *collect_artifacts - script: - - scripts/gitlab/build-linux.sh - - sccache -s - build-android: <<: *build-on-linux image: parity/rust-parity-ethereum-android-build:stretch From 23f751b537921c608f1c1bcca4ea186377dde6fc Mon Sep 17 00:00:00 2001 From: Denis P Date: Thu, 11 Apr 2019 21:51:34 +0200 Subject: [PATCH 29/29] shouldn't skip ci --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b5fa9ce79a..12c65aeff83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,6 +77,7 @@ variables: - scripts/gitlab/build-linux.sh - sccache -s + cargo-check 0 3: stage: test <<: *docker-cache-status