Merge pull request #6270 from EOSIO/add-package-build

Add debian package build step to buildkite pipeline
EOSIO · Nov 8, 2018 · 5f06702 · 5f06702
2 parents 065480d + fc6ce29
commit 5f06702
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 16 deletions.
diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
@@ -332,3 +332,22 @@ steps:
         image: "eosio/ci:amazonlinux"
         workdir: /data/job
     timeout: 60
+
+  - wait
+
+  - command: |
+        echo "--- :arrow_down: Downloading build directory" && \
+        buildkite-agent artifact download "build.tar.gz" . --step ":ubuntu: Build" && \
+        tar -zxf build.tar.gz && \
+        echo "+++ :microscope: Starting package build" && \
+        cd /data/job/build/packages && bash generate_package.sh deb
+    label: ":ubuntu: Package builder"
+    agents:
+      - "role=linux-builder"
+    artifact_paths:
+      - "build/packages/*.deb"
+    plugins:
+      docker#v1.4.0:
+        image: "eosio/ci:ubuntu"
+        workdir: /data/job
+    timeout: 60
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,7 +35,7 @@ set( CXX_STANDARD_REQUIRED ON)
 
 set(VERSION_MAJOR 1)
 set(VERSION_MINOR 4)
-set(VERSION_PATCH 2)
+set(VERSION_PATCH 3)
 
 set( CLI_CLIENT_EXECUTABLE_NAME cleos )
 set( NODE_EXECUTABLE_NAME nodeos )

diff --git a/Docker/README.md b/Docker/README.md
@@ -20,10 +20,10 @@ cd eos/Docker
 docker build . -t eosio/eos
 ```
 
-The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.4.2 tag, you could do the following:
+The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v1.4.3 tag, you could do the following:
 
 ```bash
-docker build -t eosio/eos:v1.4.2 --build-arg branch=v1.4.2 .
+docker build -t eosio/eos:v1.4.3 --build-arg branch=v1.4.3 .
 ```
 
 By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image.

diff --git a/README.md b/README.md
@@ -1,3 +1,4 @@
+
 # EOSIO - The Most Powerful Infrastructure for Decentralized Applications
 
 [![Build status](https://badge.buildkite.com/370fe5c79410f7d695e4e34c500b4e86e3ac021c6b1f739e20.svg?branch=master)](https://buildkite.com/EOSIO/eosio)
@@ -38,22 +39,22 @@ $ brew remove eosio
 ```
 #### Ubuntu 18.04 Debian Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.4.2/eosio-1.4.2.ubuntu-18.04-x86_64.deb
-$ sudo apt install ./eosio-1.4.2.ubuntu-18.04-x86_64.deb
+$ wget https://github.com/eosio/eos/releases/download/v1.4.3/eosio-1.4.3.ubuntu-18.04-x86_64.deb
+$ sudo apt install ./eosio-1.4.3.ubuntu-18.04-x86_64.deb
 ```
 #### Ubuntu 16.04 Debian Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.4.2/eosio-1.4.2.ubuntu-16.04-x86_64.deb
-$ sudo apt install ./eosio-1.4.2.ubuntu-16.04-x86_64.deb
+$ wget https://github.com/eosio/eos/releases/download/v1.4.3/eosio-1.4.3.ubuntu-16.04-x86_64.deb
+$ sudo apt install ./eosio-1.4.3.ubuntu-16.04-x86_64.deb
 ```
 #### Debian Package Uninstall
 ```sh
 $ sudo apt remove eosio
 ```
 #### RPM Package Install
 ```sh
-$ wget https://github.com/eosio/eos/releases/download/v1.4.2/eosio-1.4.2.x86_64-0.x86_64.rpm
-$ sudo yum install ./eosio-1.4.2.x86_64-0.x86_64.rpm
+$ wget https://github.com/eosio/eos/releases/download/v1.4.3/eosio-1.4.3.x86_64-0.x86_64.rpm
+$ sudo yum install ./eosio-1.4.3.x86_64-0.x86_64.rpm
 ```
 #### RPM Package Uninstall
 ```sh

diff --git a/libraries/appbase b/libraries/appbase
diff --git a/libraries/chain/wasm_interface.cpp b/libraries/chain/wasm_interface.cpp
@@ -1329,11 +1329,9 @@ class transaction_api : public context_aware_api {
       }
 
       void send_deferred( const uint128_t& sender_id, account_name payer, array_ptr<char> data, size_t data_len, uint32_t replace_existing) {
-         try {
-            transaction trx;
-            fc::raw::unpack<transaction>(data, data_len, trx);
-            context.schedule_deferred_transaction(sender_id, payer, std::move(trx), replace_existing);
-         } FC_RETHROW_EXCEPTIONS(warn, "data as hex: ${data}", ("data", fc::to_hex(data, data_len)))
+         transaction trx;
+         fc::raw::unpack<transaction>(data, data_len, trx);
+         context.schedule_deferred_transaction(sender_id, payer, std::move(trx), replace_existing);
       }
 
       bool cancel_deferred( const unsigned __int128& val ) {

diff --git a/plugins/chain_plugin/chain_plugin.cpp b/plugins/chain_plugin/chain_plugin.cpp
@@ -249,6 +249,7 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
           "In \"light\" mode all incoming blocks headers will be fully validated; transactions in those validated blocks will be trusted \n")
          ("disable-ram-billing-notify-checks", bpo::bool_switch()->default_value(false),
           "Disable the check which subjectively fails a transaction if a contract bills more RAM to another account within the context of a notification handler (i.e. when the receiver is not the code of the action).")
+         ("trusted-producer", bpo::value<vector<string>>()->composing(), "Indicate a producer whose blocks headers signed by it will be fully validated, but transactions in those validated blocks will be trusted.")
          ;
 
 // TODO: rate limiting
@@ -286,7 +287,6 @@ void chain_plugin::set_program_options(options_description& cli, options_descrip
           "replace reversible block database with blocks imported from specified file and then exit")
          ("export-reversible-blocks", bpo::value<bfs::path>(),
            "export reversible block database in portable format into specified file and then exit")
-         ("trusted-producer", bpo::value<vector<string>>()->composing(), "Indicate a producer whose blocks headers signed by it will be fully validated, but transactions in those validated blocks will be trusted.")
          ("snapshot", bpo::value<bfs::path>(), "File to read Snapshot State from")
          ;
 

diff --git a/plugins/history_plugin/history_plugin.cpp b/plugins/history_plugin/history_plugin.cpp
@@ -282,6 +282,9 @@ namespace eosio {
          }
 
          void on_applied_transaction( const transaction_trace_ptr& trace ) {
+            if( !trace->receipt || (trace->receipt->status != transaction_receipt_header::executed &&
+                  trace->receipt->status != transaction_receipt_header::soft_fail) )
+               return;
             for( const auto& atrace : trace->action_traces ) {
                on_action_trace( atrace );
             }

diff --git a/programs/nodeos/main.cpp b/programs/nodeos/main.cpp
@@ -108,6 +108,8 @@ int main(int argc, char** argv)
       initialize_logging();
       ilog("nodeos version ${ver}", ("ver", app().version_string()));
       ilog("eosio root is ${root}", ("root", root.string()));
+      ilog("nodeos using configuration file ${c}", ("c", app().full_config_file_path().string()));
+      ilog("nodeos data directory is ${d}", ("d", app().data_dir().string()));
       app().startup();
       app().exec();
    } catch( const extract_genesis_state_exception& e ) {