From 237d83f1ac80cf512ae43a7a3f26cb72191f6ace Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 11 May 2020 11:07:38 +0200 Subject: [PATCH 1/7] fix (ci): hotfix Docker release --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16c77738c61b0..681453350608e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -399,6 +399,7 @@ build-linux-substrate: &build-binary - sha256sum ./artifacts/substrate/substrate | tee ./artifacts/substrate/substrate.sha256 - printf '\n# building node-template\n\n' - ./.maintain/node-template-release.sh ./artifacts/substrate/substrate-node-template.tar.gz + - cp -r .maintain/docker/substrate.Dockerfile ./artifacts/substrate/ - sccache -s @@ -416,6 +417,7 @@ build-linux-subkey: &build-subkey sed -n -E 's/^subkey ([0-9.]+.*)/\1/p' | tee ./artifacts/subkey/VERSION; - sha256sum ./artifacts/subkey/subkey | tee ./artifacts/subkey/subkey.sha256 + - cp -r .maintain/docker/subkey.Dockerfile ./artifacts/subkey/ - sccache -s build-macos-subkey: From 6cdfac267dc5008340b10c0b4d7d63350016860a Mon Sep 17 00:00:00 2001 From: Denis P Date: Tue, 2 Jun 2020 23:35:00 +0200 Subject: [PATCH 2/7] change (ci): moving to the tested CI image with a proper name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bdf614063a7b1..7d1723c4f5459 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ default: name: parity-build .docker-env: &docker-env - image: parity/rust-builder:latest + image: paritytech/substrate-ci-linux:production before_script: - rustup show - cargo --version From e7d0061182eeab64a12c297274b28a64cc5ac8cf Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 8 Jun 2020 11:13:51 +0200 Subject: [PATCH 3/7] change (ci): rename substrate-ci-linux --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d1723c4f5459..bd4fc65e85d61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ default: name: parity-build .docker-env: &docker-env - image: paritytech/substrate-ci-linux:production + image: paritytech/ci-linux:production before_script: - rustup show - cargo --version From 15938a22b6c30b26091acf5b2e141e06515b78fd Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 10 Jun 2020 09:52:00 +0200 Subject: [PATCH 4/7] Reduce the lots_of_incoming_peers_works test load (#6314) --- client/network/src/service/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs index 8e79ae0e172f4..b2a91af5bdc25 100644 --- a/client/network/src/service/tests.rs +++ b/client/network/src/service/tests.rs @@ -291,7 +291,7 @@ fn lots_of_incoming_peers_works() { // this test ends. let mut background_tasks_to_wait = Vec::new(); - for _ in 0..256 { + for _ in 0..32 { let main_node_peer_id = main_node_peer_id.clone(); let (_dialing_node, event_stream) = build_test_full_node(config::NetworkConfiguration { From e815975adfacb377ec584fa3486f341a0af095e6 Mon Sep 17 00:00:00 2001 From: Denis P Date: Tue, 2 Jun 2020 23:35:00 +0200 Subject: [PATCH 5/7] change (ci): moving to the tested CI image with a proper name --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bdf614063a7b1..7d1723c4f5459 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ default: name: parity-build .docker-env: &docker-env - image: parity/rust-builder:latest + image: paritytech/substrate-ci-linux:production before_script: - rustup show - cargo --version From 6ce2c9b4074e7224b7038438fff3cc8b79ddcbcd Mon Sep 17 00:00:00 2001 From: Denis P Date: Mon, 8 Jun 2020 11:13:51 +0200 Subject: [PATCH 6/7] change (ci): rename substrate-ci-linux --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7d1723c4f5459..bd4fc65e85d61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -58,7 +58,7 @@ default: name: parity-build .docker-env: &docker-env - image: paritytech/substrate-ci-linux:production + image: paritytech/ci-linux:production before_script: - rustup show - cargo --version From c7421d80ee75e492f7dc1f4e3a66c6e743ac09d6 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 10 Jun 2020 09:52:00 +0200 Subject: [PATCH 7/7] Reduce the lots_of_incoming_peers_works test load (#6314) --- client/network/src/service/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/network/src/service/tests.rs b/client/network/src/service/tests.rs index 8e79ae0e172f4..b2a91af5bdc25 100644 --- a/client/network/src/service/tests.rs +++ b/client/network/src/service/tests.rs @@ -291,7 +291,7 @@ fn lots_of_incoming_peers_works() { // this test ends. let mut background_tasks_to_wait = Vec::new(); - for _ in 0..256 { + for _ in 0..32 { let main_node_peer_id = main_node_peer_id.clone(); let (_dialing_node, event_stream) = build_test_full_node(config::NetworkConfiguration {