From b31e73526dd6dc709e6955454cb1ffdcf12035b2 Mon Sep 17 00:00:00 2001 From: johndebord Date: Thu, 19 Dec 2019 17:40:42 -0500 Subject: [PATCH 01/14] Fix linking OpenSSL --- CMakeModules/EosioTester.cmake.in | 36 ++++++++++++------------ CMakeModules/EosioTesterBuild.cmake.in | 38 +++++++++++++------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/CMakeModules/EosioTester.cmake.in b/CMakeModules/EosioTester.cmake.in index a3cc2342bf9..b22e638bb53 100644 --- a/CMakeModules/EosioTester.cmake.in +++ b/CMakeModules/EosioTester.cmake.in @@ -45,28 +45,28 @@ find_package(Boost 1.67 REQUIRED COMPONENTS iostreams unit_test_framework) -find_library(libtester eosio_testing @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) -find_library(libchain eosio_chain @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) +find_library(libtester eosio_testing @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) +find_library(libchain eosio_chain @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" ) - find_library(libfc fc_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) - find_library(libsecp256k1 secp256k1_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) + find_library(libfc fc_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) + find_library(libsecp256k1 secp256k1_debug @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) else() - find_library(libfc fc @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) - find_library(libsecp256k1 secp256k1 @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) + find_library(libfc fc @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) + find_library(libsecp256k1 secp256k1 @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) endif() -find_library(libwasm WASM @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) -find_library(libwast WAST @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) -find_library(libwabt wabt @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) -find_library(libir IR @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) -find_library(libplatform Platform @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) -find_library(liblogging Logging @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) -find_library(libruntime Runtime @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) -find_library(libsoftfloat softfloat @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) -find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib) -find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib) -find_library(libchainbase chainbase @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) -find_library(libbuiltins builtins @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib) +find_library(libwasm WASM @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) +find_library(libwast WAST @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) +find_library(libwabt wabt @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) +find_library(libir IR @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) +find_library(libplatform Platform @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) +find_library(liblogging Logging @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) +find_library(libruntime Runtime @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) +find_library(libsoftfloat softfloat @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) +find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib NO_DEFAULT_PATH) +find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib NO_DEFAULT_PATH) +find_library(libchainbase chainbase @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) +find_library(libbuiltins builtins @CMAKE_INSTALL_PREFIX@/lib64 @CMAKE_INSTALL_PREFIX@/lib NO_DEFAULT_PATH) find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir HINTS ENV GMP_LIB_DIR ENV GMP_DIR diff --git a/CMakeModules/EosioTesterBuild.cmake.in b/CMakeModules/EosioTesterBuild.cmake.in index a1ea88182a9..4149ef5251d 100644 --- a/CMakeModules/EosioTesterBuild.cmake.in +++ b/CMakeModules/EosioTesterBuild.cmake.in @@ -43,29 +43,29 @@ find_package(Boost 1.67 REQUIRED COMPONENTS iostreams unit_test_framework) -find_library(libtester eosio_testing @CMAKE_BINARY_DIR@/libraries/testing) -find_library(libchain eosio_chain @CMAKE_BINARY_DIR@/libraries/chain) +find_library(libtester eosio_testing @CMAKE_BINARY_DIR@/libraries/testing NO_DEFAULT_PATH) +find_library(libchain eosio_chain @CMAKE_BINARY_DIR@/libraries/chain NO_DEFAULT_PATH) if ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" ) - find_library(libfc fc_debug @CMAKE_BINARY_DIR@/libraries/fc) - find_library(libsecp256k1 secp256k1_debug @CMAKE_BINARY_DIR@/libraries/fc/secp256k1) - + find_library(libfc fc_debug @CMAKE_BINARY_DIR@/libraries/fc NO_DEFAULT_PATH) + find_library(libsecp256k1 secp256k1_debug @CMAKE_BINARY_DIR@/libraries/fc/secp256k1 NO_DEFAULT_PATH) + else() - find_library(libfc fc @CMAKE_BINARY_DIR@/libraries/fc) - find_library(libsecp256k1 secp256k1 @CMAKE_BINARY_DIR@/libraries/fc/secp256k1) + find_library(libfc fc @CMAKE_BINARY_DIR@/libraries/fc NO_DEFAULT_PATH) + find_library(libsecp256k1 secp256k1 @CMAKE_BINARY_DIR@/libraries/fc/secp256k1 NO_DEFAULT_PATH) endif() -find_library(libwasm WASM @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WASM) -find_library(libwast WAST @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WAST) -find_library(libir IR @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/IR) -find_library(libwabt wabt @CMAKE_BINARY_DIR@/libraries/wabt) -find_library(libplatform Platform @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Platform) -find_library(liblogging Logging @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Logging) -find_library(libruntime Runtime @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Runtime) -find_library(libsoftfloat softfloat @CMAKE_BINARY_DIR@/libraries/softfloat) -find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib) -find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib) -find_library(libchainbase chainbase @CMAKE_BINARY_DIR@/libraries/chainbase) -find_library(libbuiltins builtins @CMAKE_BINARY_DIR@/libraries/builtins) +find_library(libwasm WASM @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WASM NO_DEFAULT_PATH) +find_library(libwast WAST @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/WAST NO_DEFAULT_PATH) +find_library(libir IR @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/IR NO_DEFAULT_PATH) +find_library(libwabt wabt @CMAKE_BINARY_DIR@/libraries/wabt NO_DEFAULT_PATH) +find_library(libplatform Platform @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Platform NO_DEFAULT_PATH) +find_library(liblogging Logging @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Logging NO_DEFAULT_PATH) +find_library(libruntime Runtime @CMAKE_BINARY_DIR@/libraries/wasm-jit/Source/Runtime NO_DEFAULT_PATH) +find_library(libsoftfloat softfloat @CMAKE_BINARY_DIR@/libraries/softfloat NO_DEFAULT_PATH) +find_library(liboscrypto crypto @OPENSSL_ROOT_DIR@/lib NO_DEFAULT_PATH) +find_library(libosssl ssl @OPENSSL_ROOT_DIR@/lib NO_DEFAULT_PATH) +find_library(libchainbase chainbase @CMAKE_BINARY_DIR@/libraries/chainbase NO_DEFAULT_PATH) +find_library(libbuiltins builtins @CMAKE_BINARY_DIR@/libraries/builtins NO_DEFAULT_PATH) find_library(GMP_LIBRARIES NAMES libgmp.a gmp.lib gmp libgmp-10 mpir HINTS ENV GMP_LIB_DIR ENV GMP_DIR From 6b8820d21a8b37cb972af84e72bebabdd24566a7 Mon Sep 17 00:00:00 2001 From: Zach Butler Date: Thu, 19 Dec 2019 10:21:19 -0500 Subject: [PATCH 02/14] Fix whitespace --- .cicd/generate-pipeline.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index 53749b9ca2a..796da2dafdb 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -321,7 +321,7 @@ done # trigger eosio-lrt post pr if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then if ( [[ ! $PINNED == false ]] ); then - cat < Date: Thu, 19 Dec 2019 10:21:53 -0500 Subject: [PATCH 03/14] Consistent package builder timeouts --- .cicd/generate-pipeline.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index 796da2dafdb..c0c274830bd 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -439,7 +439,7 @@ cat < Date: Thu, 19 Dec 2019 10:28:00 -0500 Subject: [PATCH 04/14] Build EOSIO Docker images for every commit --- .cicd/installation-build.sh | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/.cicd/installation-build.sh b/.cicd/installation-build.sh index 4942b140a9d..83dc7b48ff2 100755 --- a/.cicd/installation-build.sh +++ b/.cicd/installation-build.sh @@ -2,19 +2,14 @@ set -eo pipefail . ./.cicd/helpers/general.sh export ENABLE_INSTALL=true -if [[ $BUILDKITE_BRANCH =~ ^release/[0-9]+.[0-9]+.x$ || $BUILDKITE_BRANCH =~ ^master$ || $BUILDKITE_BRANCH =~ ^develop$ || ! -z $BUILDKITE_TAG || $FORCE_BINARIES_BUILD == true ]]; then - export BRANCH=$(echo $BUILDKITE_BRANCH | sed 's/\//\_/') - export CONTRACTS_BUILDER_TAG="eosio/ci-contracts-builder:base-ubuntu-18.04" - export ARGS="--name ci-contracts-builder-$BUILDKITE_COMMIT --init -v $(pwd):$MOUNTED_DIR" - $CICD_DIR/build.sh - docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BUILDKITE_COMMIT - docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BRANCH - docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BRANCH-$BUILDKITE_COMMIT - docker push $CONTRACTS_BUILDER_TAG-$BUILDKITE_COMMIT - docker push $CONTRACTS_BUILDER_TAG-$BRANCH - docker push $CONTRACTS_BUILDER_TAG-$BRANCH-$BUILDKITE_COMMIT - docker stop ci-contracts-builder-$BUILDKITE_COMMIT && docker rm ci-contracts-builder-$BUILDKITE_COMMIT -else - echo "Contract builder images are only created for tags or master, develop, and release branches. Start a new build with FORCE_BINARIES_BUILD=true to create a Contract Builder image for other branches/commits. Exiting..." - exit 0 -fi \ No newline at end of file +export BRANCH=$(echo $BUILDKITE_BRANCH | sed 's/\//\_/') +export CONTRACTS_BUILDER_TAG="eosio/ci-contracts-builder:base-ubuntu-18.04" +export ARGS="--name ci-contracts-builder-$BUILDKITE_COMMIT --init -v $(pwd):$MOUNTED_DIR" +$CICD_DIR/build.sh +docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BUILDKITE_COMMIT +docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BRANCH +docker commit ci-contracts-builder-$BUILDKITE_COMMIT $CONTRACTS_BUILDER_TAG-$BRANCH-$BUILDKITE_COMMIT +docker push $CONTRACTS_BUILDER_TAG-$BUILDKITE_COMMIT +docker push $CONTRACTS_BUILDER_TAG-$BRANCH +docker push $CONTRACTS_BUILDER_TAG-$BRANCH-$BUILDKITE_COMMIT +docker stop ci-contracts-builder-$BUILDKITE_COMMIT && docker rm ci-contracts-builder-$BUILDKITE_COMMIT \ No newline at end of file From bfc612e29f70aa94bf1277bf6d01ddd830d89596 Mon Sep 17 00:00:00 2001 From: Zach Butler Date: Thu, 19 Dec 2019 10:33:54 -0500 Subject: [PATCH 05/14] Build Docker container up front to be used for testing, then tag with git branch and git tag after tests have passed --- .cicd/docker-tag.sh | 22 ++++++++++++++++++++++ .cicd/generate-pipeline.sh | 25 +++++++++++++++++++------ .cicd/installation-build.sh | 5 ++--- 3 files changed, 43 insertions(+), 9 deletions(-) create mode 100755 .cicd/docker-tag.sh diff --git a/.cicd/docker-tag.sh b/.cicd/docker-tag.sh new file mode 100755 index 00000000000..d9f03c06a52 --- /dev/null +++ b/.cicd/docker-tag.sh @@ -0,0 +1,22 @@ +#!/bin/bash +set -eo pipefail +echo '+++ :evergreen_tree: Configuring Environment' +REPO='eosio/ci-contracts-builder' +PREFIX='base-ubuntu-18.04' +IMAGE="$REPO:$PREFIX-$BUILDKITE_COMMIT" +SANITIZED_BRANCH=$(echo "$BUILDKITE_BRANCH" | tr '/' '_') +SANITIZED_TAG=$(echo "$BUILDKITE_TAG" | tr '/' '_') +echo '+++ :arrow_down: Pulling Container' +echo "Pulling \"$IMAGE\"" +docker pull "$IMAGE" +echo '+++ :label: Tagging Container' +docker tag "$IMAGE" "$REPO:$PREFIX-$SANITIZED_BRANCH" +echo "Tagged \"$REPO:$PREFIX-$SANITIZED_BRANCH\"." +[[ -z "$BUILDKITE_TAG" ]] || docker tag "$IMAGE" "$REPO:$PREFIX-$SANITIZED_TAG" && echo "Tagged \"$REPO:$PREFIX-$SANITIZED_TAG\"." +echo '+++ :arrow_up: Pushing Container' +docker push "$REPO:$PREFIX-$SANITIZED_BRANCH" +[[ -z "$BUILDKITE_TAG" ]] || docker push "$REPO:$PREFIX-$SANITIZED_TAG" +echo '+++ :put_litter_in_its_place: Cleaning Up' +docker rmi "$REPO:$PREFIX-$SANITIZED_BRANCH" +[[ -z "$BUILDKITE_TAG" ]] || docker rmi "$REPO:$PREFIX-$SANITIZED_TAG" +docker rmi "$IMAGE" \ No newline at end of file diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index c0c274830bd..9e1bfdc7131 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -142,8 +142,21 @@ EOF EOF fi done -echo ' - wait' -echo '' +cat < Date: Thu, 19 Dec 2019 14:36:09 -0500 Subject: [PATCH 06/14] Add sync-from-genesis test to every build --- .cicd/generate-pipeline.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index 9e1bfdc7131..53d1047d541 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -371,6 +371,23 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then EOF fi fi +# trigger eosio-sync-from-genesis for every build +if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && -z "${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}" ]]; then + cat < Date: Thu, 19 Dec 2019 15:06:24 -0500 Subject: [PATCH 07/14] Unified look-and-feel across pipelines --- .cicd/generate-pipeline.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index 53d1047d541..90c555f338f 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -374,7 +374,7 @@ fi # trigger eosio-sync-from-genesis for every build if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && -z "${SKIP_INSTALL}${SKIP_LINUX}${SKIP_DOCKER}" ]]; then cat < Date: Thu, 19 Dec 2019 15:07:31 -0500 Subject: [PATCH 08/14] Include link to origin in triggered build --- .cicd/generate-pipeline.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index 90c555f338f..80306292826 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -346,6 +346,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}" BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}" + BUILDKITE_TRIGGERED_FROM_BUILD_LINK: "${BUILDKITE_BUILD_URL}" SKIP_BUILD: "true" PINNED: "${PINNED}" @@ -367,6 +368,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then BUILDKITE_PULL_REQUEST: "${BUILDKITE_PULL_REQUEST}" BUILDKITE_PULL_REQUEST_BASE_BRANCH: "${BUILDKITE_PULL_REQUEST_BASE_BRANCH}" BUILDKITE_PULL_REQUEST_REPO: "${BUILDKITE_PULL_REQUEST_REPO}" + BUILDKITE_TRIGGERED_FROM_BUILD_LINK: "${BUILDKITE_BUILD_URL}" EOF fi @@ -382,6 +384,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && -z "${SKIP_INSTALL}${SKIP_LINUX}$ commit: "${BUILDKITE_COMMIT}" branch: "${BUILDKITE_BRANCH}" env: + BUILDKITE_TRIGGERED_FROM_BUILD_LINK: "${BUILDKITE_BUILD_URL}" SKIP_JUNGLE: "${SKIP_JUNGLE}" SKIP_KYLIN: "${SKIP_KYLIN}" SKIP_MAIN: "${SKIP_MAIN}" From d98d1fb3c760da67a3de3ae4a86e6f209bfc1043 Mon Sep 17 00:00:00 2001 From: Zach Butler Date: Thu, 19 Dec 2019 16:32:03 -0500 Subject: [PATCH 09/14] Pass timeout through to sync test --- .cicd/generate-pipeline.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index 80306292826..a95906cb74d 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -388,6 +388,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && -z "${SKIP_INSTALL}${SKIP_LINUX}$ SKIP_JUNGLE: "${SKIP_JUNGLE}" SKIP_KYLIN: "${SKIP_KYLIN}" SKIP_MAIN: "${SKIP_MAIN}" + TIMEOUT: "${TIMEOUT}" EOF fi From de8a7973af684edbb9c30dee98556068b19063cc Mon Sep 17 00:00:00 2001 From: Zach Butler Date: Fri, 20 Dec 2019 09:27:35 -0500 Subject: [PATCH 10/14] Delete the pipeline.yml, obsolete since eos-buildkite-pipelines PR 61 --- .cicd/pipeline.yml | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 .cicd/pipeline.yml diff --git a/.cicd/pipeline.yml b/.cicd/pipeline.yml deleted file mode 100644 index 50cf1a713d7..00000000000 --- a/.cicd/pipeline.yml +++ /dev/null @@ -1,8 +0,0 @@ -steps: - - wait - - - label: ":pipeline: Generate Pipeline Steps" - command: "./.cicd/generate-pipeline.sh | buildkite-agent pipeline upload" - agents: - queue: "automation-basic-builder-fleet" - timeout: ${TIMEOUT:-10} \ No newline at end of file From 5b16f87f829b1118044eb5ca68cb8bf50d2a378c Mon Sep 17 00:00:00 2001 From: Zach Butler Date: Fri, 20 Dec 2019 10:01:10 -0500 Subject: [PATCH 11/14] Commit messages sometimes have invalid YAML syntax which breaks the pipeline --- .cicd/generate-pipeline.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.cicd/generate-pipeline.sh b/.cicd/generate-pipeline.sh index a95906cb74d..96aeb22643e 100755 --- a/.cicd/generate-pipeline.sh +++ b/.cicd/generate-pipeline.sh @@ -339,7 +339,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB == "true" ]]; then trigger: "eosio-lrt" async: true build: - message: "${BUILDKITE_MESSAGE}" + message: "Triggered by EOSIO build ${BUILDKITE_BUILD_NUMBER}" commit: "${BUILDKITE_COMMIT}" branch: "${BUILDKITE_BRANCH}" env: @@ -361,7 +361,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && $TRIGGER_JOB = "true" ]]; then trigger: "eos-multiversion-tests" async: true build: - message: "${BUILDKITE_MESSAGE}" + message: "Triggered by EOSIO build ${BUILDKITE_BUILD_NUMBER}" commit: "${BUILDKITE_COMMIT}" branch: "${BUILDKITE_BRANCH}" env: @@ -380,7 +380,7 @@ if [[ -z $BUILDKITE_TRIGGERED_FROM_BUILD_ID && -z "${SKIP_INSTALL}${SKIP_LINUX}$ trigger: "eosio-sync-from-genesis" async: false build: - message: "${BUILDKITE_MESSAGE}" + message: "Triggered by EOSIO build ${BUILDKITE_BUILD_NUMBER}" commit: "${BUILDKITE_COMMIT}" branch: "${BUILDKITE_BRANCH}" env: From ebeb5976288744ce22525313582d619ec04446b8 Mon Sep 17 00:00:00 2001 From: Matt Witherspoon <32485495+spoonincode@users.noreply.github.com> Date: Mon, 30 Dec 2019 20:49:54 -0500 Subject: [PATCH 12/14] Revert "Only send handshake if it has changed from last send." This reverts commit 1e63a33 which is causing sync problems when starting from a snapshot --- plugins/net_plugin/net_plugin.cpp | 35 +++++++++++-------------------- 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/plugins/net_plugin/net_plugin.cpp b/plugins/net_plugin/net_plugin.cpp index 57811ce7037..203077c21e0 100644 --- a/plugins/net_plugin/net_plugin.cpp +++ b/plugins/net_plugin/net_plugin.cpp @@ -386,7 +386,7 @@ namespace eosio { }; struct handshake_initializer { - static bool populate(handshake_message& hello); + static void populate(handshake_message &hello); }; class queued_buffer : boost::noncopyable { @@ -908,16 +908,15 @@ namespace eosio { } void connection::send_handshake() { - if( handshake_initializer::populate(last_handshake_sent) ) { - static_assert( std::is_same_v, "INT16_MAX based on int16_t" ); - if( sent_handshake_count == INT16_MAX ) sent_handshake_count = 1; // do not wrap - last_handshake_sent.generation = ++sent_handshake_count; - fc_ilog( logger, "Sending handshake generation ${g} to ${ep}, lib ${lib}, head ${head}, id ${id}", - ("g", last_handshake_sent.generation)("ep", peer_name()) - ("lib", last_handshake_sent.last_irreversible_block_num) - ("head", last_handshake_sent.head_num)("id", last_handshake_sent.head_id.str().substr( 8, 16 )) ); - enqueue( last_handshake_sent ); - } + handshake_initializer::populate(last_handshake_sent); + static_assert( std::is_same_v, "INT16_MAX based on int16_t" ); + if( sent_handshake_count == INT16_MAX ) sent_handshake_count = 1; // do not wrap + last_handshake_sent.generation = ++sent_handshake_count; + fc_ilog( logger, "Sending handshake generation ${g} to ${ep}, lib ${lib}, head ${head}, id ${id}", + ("g", last_handshake_sent.generation)("ep", peer_name()) + ("lib", last_handshake_sent.last_irreversible_block_num) + ("head", last_handshake_sent.head_num)("id", last_handshake_sent.head_id.str().substr(8,16)) ); + enqueue(last_handshake_sent); } void connection::send_time() { @@ -2591,8 +2590,7 @@ namespace eosio { controller &cc = chain_plug->chain(); block_id_type blk_id = msg->id(); uint32_t blk_num = msg->block_num(); - fc_dlog( logger, "received block ${num}, id ${id}..., canceling wait on ${p}", - ("num", blk_num)("id", blk_id.str().substr(8,16))("p", c->peer_name()) ); + fc_dlog(logger, "canceling wait on ${p}", ("p",c->peer_name())); c->cancel_wait(); try { @@ -2871,10 +2869,9 @@ namespace eosio { return chain::signature_type(); } - bool + void handshake_initializer::populate( handshake_message &hello) { namespace sc = std::chrono; - bool send = true; hello.network_version = net_version_base + net_version; hello.chain_id = my_impl->chain_id; hello.node_id = my_impl->node_id; @@ -2898,8 +2895,6 @@ namespace eosio { hello.agent = my_impl->user_agent_name; - auto prev_head_id = hello.head_id; - auto prev_lib_id = hello.last_irreversible_block_id; controller& cc = my_impl->chain_plug->chain(); hello.head_id = fc::sha256(); hello.last_irreversible_block_id = fc::sha256(); @@ -2912,7 +2907,6 @@ namespace eosio { catch( const unknown_block_exception &ex) { fc_wlog( logger, "caught unkown_block" ); hello.last_irreversible_block_num = 0; - send = false; } } if( hello.head_num ) { @@ -2921,13 +2915,8 @@ namespace eosio { } catch( const unknown_block_exception &ex) { hello.head_num = 0; - send = false; } } - - if( send && hello.last_irreversible_block_id == prev_lib_id && hello.head_id == prev_head_id ) send = false; - - return send; } net_plugin::net_plugin() From 63bf8e2e8539042c41321ffefbafb92322a7aeea Mon Sep 17 00:00:00 2001 From: Kevin Heifner Date: Thu, 2 Jan 2020 12:23:14 -0600 Subject: [PATCH 13/14] Propagate exceptions out of on_incoming_block push_block so net_plugin knows block was not applied --- plugins/producer_plugin/producer_plugin.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/plugins/producer_plugin/producer_plugin.cpp b/plugins/producer_plugin/producer_plugin.cpp index c02bc7f27b9..f207602aee6 100644 --- a/plugins/producer_plugin/producer_plugin.cpp +++ b/plugins/producer_plugin/producer_plugin.cpp @@ -378,7 +378,6 @@ class producer_plugin_impl : public std::enable_shared_from_this().publish( priority::medium, block ); + throw; } catch ( const std::bad_alloc& ) { chain_plugin::handle_bad_alloc(); } catch ( boost::interprocess::bad_alloc& ) { chain_plugin::handle_db_exhaustion(); } - if( except ) { - app().get_channel().publish( priority::medium, block ); - return; - } - const auto& hbs = chain.head_block_state(); if( hbs->header.timestamp.next().to_time_point() >= fc::time_point::now() ) { _production_enabled = true; From bfbf10d589c1b888baa0fd96ec08cbceb2e17e9a Mon Sep 17 00:00:00 2001 From: Bucky Kittinger Date: Thu, 2 Jan 2020 14:51:57 -0500 Subject: [PATCH 14/14] bump version --- CMakeLists.txt | 2 +- README.md | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 859d47b69f1..dd9eb965061 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ set( CXX_STANDARD_REQUIRED ON) set(VERSION_MAJOR 1) set(VERSION_MINOR 8) -set(VERSION_PATCH 7) +set(VERSION_PATCH 8) #set(VERSION_SUFFIX develop) if(VERSION_SUFFIX) diff --git a/README.md b/README.md index 6cb4bee7081..9d2c44817ec 100644 --- a/README.md +++ b/README.md @@ -44,13 +44,13 @@ $ brew remove eosio #### Ubuntu 18.04 Package Install ```sh -$ wget https://github.com/eosio/eos/releases/download/v1.8.7/eosio_1.8.7-1-ubuntu-18.04_amd64.deb -$ sudo apt install ./eosio_1.8.7-1-ubuntu-18.04_amd64.deb +$ wget https://github.com/eosio/eos/releases/download/v1.8.8/eosio_1.8.8-1-ubuntu-18.04_amd64.deb +$ sudo apt install ./eosio_1.8.8-1-ubuntu-18.04_amd64.deb ``` #### Ubuntu 16.04 Package Install ```sh -$ wget https://github.com/eosio/eos/releases/download/v1.8.7/eosio_1.8.7-1-ubuntu-16.04_amd64.deb -$ sudo apt install ./eosio_1.8.7-1-ubuntu-16.04_amd64.deb +$ wget https://github.com/eosio/eos/releases/download/v1.8.8/eosio_1.8.8-1-ubuntu-16.04_amd64.deb +$ sudo apt install ./eosio_1.8.8-1-ubuntu-16.04_amd64.deb ``` #### Ubuntu Package Uninstall ```sh @@ -58,8 +58,8 @@ $ sudo apt remove eosio ``` #### Centos RPM Package Install ```sh -$ wget https://github.com/eosio/eos/releases/download/v1.8.7/eosio-1.8.7-1.el7.x86_64.rpm -$ sudo yum install ./eosio-1.8.7-1.el7.x86_64.rpm +$ wget https://github.com/eosio/eos/releases/download/v1.8.8/eosio-1.8.8-1.el7.x86_64.rpm +$ sudo yum install ./eosio-1.8.8-1.el7.x86_64.rpm ``` #### Centos RPM Package Uninstall ```sh