From c7e100001898e4b3255fe4a77e4f22c2a5200306 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Mon, 14 Jun 2021 19:38:42 +0100 Subject: [PATCH 1/9] added binaries --- Cargo.lock | 12 ++++++++++++ Cargo.toml | 5 ++++- farm/Cargo.toml | 9 +++++++++ farm/src/main.rs | 3 +++ node/Cargo.toml | 9 +++++++++ node/src/main.rs | 3 +++ wallet/Cargo.toml | 9 +++++++++ wallet/src/main.rs | 3 +++ 8 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 farm/Cargo.toml create mode 100644 farm/src/main.rs create mode 100644 node/Cargo.toml create mode 100644 node/src/main.rs create mode 100644 wallet/Cargo.toml create mode 100644 wallet/src/main.rs diff --git a/Cargo.lock b/Cargo.lock index 59963ca..12542f0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,17 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +[[package]] +name = "farm" +version = "0.1.0" + +[[package]] +name = "node" +version = "0.1.0" + [[package]] name = "plot" version = "0.1.0" + +[[package]] +name = "wallet" +version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index f73f4c8..cbb45db 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,4 +2,7 @@ members = [ "plot", -] \ No newline at end of file + "farm", + "wallet", + "node", +] diff --git a/farm/Cargo.toml b/farm/Cargo.toml new file mode 100644 index 0000000..613e0f7 --- /dev/null +++ b/farm/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "farm" +version = "0.1.0" +authors = ["Jake Hillion "] +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/farm/src/main.rs b/farm/src/main.rs new file mode 100644 index 0000000..e7a11a9 --- /dev/null +++ b/farm/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} diff --git a/node/Cargo.toml b/node/Cargo.toml new file mode 100644 index 0000000..f01bba2 --- /dev/null +++ b/node/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "node" +version = "0.1.0" +authors = ["Jake Hillion "] +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/node/src/main.rs b/node/src/main.rs new file mode 100644 index 0000000..e7a11a9 --- /dev/null +++ b/node/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} diff --git a/wallet/Cargo.toml b/wallet/Cargo.toml new file mode 100644 index 0000000..db5e1a6 --- /dev/null +++ b/wallet/Cargo.toml @@ -0,0 +1,9 @@ +[package] +name = "wallet" +version = "0.1.0" +authors = ["Jake Hillion "] +edition = "2018" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/wallet/src/main.rs b/wallet/src/main.rs new file mode 100644 index 0000000..e7a11a9 --- /dev/null +++ b/wallet/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} -- 2.47.0 From c281bf2ff55c361450d965752f3b165180bdada6 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Mon, 14 Jun 2021 19:42:15 +0100 Subject: [PATCH 2/9] updated dronefile --- .drone.yml | 3 ++- Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index 71e83ee..94af22c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,6 +34,7 @@ steps: path: /vendor commands: - cargo build --release + - tar -czvf target/release/linux_amd64.tar.gz target/release/{farm,node,plot,wallet} - name: release image: plugins/gitea-release @@ -42,7 +43,7 @@ steps: from_secret: gitea_token base_url: https://gitea.hillion.co.uk files: - - target/release/plot + - target/release/linux_amd64.tar.gz checksum: - sha256 when: diff --git a/Cargo.toml b/Cargo.toml index cbb45db..f49f66b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [workspace] members = [ - "plot", "farm", - "wallet", "node", + "plot", + "wallet", ] -- 2.47.0 From ad64732dee5f1fcfa1b788700dc083354470c824 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Mon, 14 Jun 2021 19:43:21 +0100 Subject: [PATCH 3/9] removed expansion --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 94af22c..df3ced0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -34,7 +34,7 @@ steps: path: /vendor commands: - cargo build --release - - tar -czvf target/release/linux_amd64.tar.gz target/release/{farm,node,plot,wallet} + - tar -czvf target/release/linux_amd64.tar.gz target/release/farm target/release/node target/release/plot target/release/wallet - name: release image: plugins/gitea-release -- 2.47.0 From 425189f0224b1b3d6d433ac2da2360426eea6088 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Mon, 14 Jun 2021 19:45:10 +0100 Subject: [PATCH 4/9] Extracted build logic --- .build.sh | 9 +++++++++ .drone.yml | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 .build.sh diff --git a/.build.sh b/.build.sh new file mode 100644 index 0000000..d957bd4 --- /dev/null +++ b/.build.sh @@ -0,0 +1,9 @@ +#!/bin/sh +set -e +set -x + +# build for all architectures +cargo build --release + +# tar binary files for upload +tar -czvf target/release/linux_amd64.tar.gz target/release/farm target/release/node target/release/plot target/release/wallet \ No newline at end of file diff --git a/.drone.yml b/.drone.yml index df3ced0..51ee7b7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,8 +33,7 @@ steps: - name: cache path: /vendor commands: - - cargo build --release - - tar -czvf target/release/linux_amd64.tar.gz target/release/farm target/release/node target/release/plot target/release/wallet + - sh .build.sh - name: release image: plugins/gitea-release -- 2.47.0 From 9dce038c63feab544455b880ff54ba26112fb791 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Mon, 14 Jun 2021 19:45:41 +0100 Subject: [PATCH 5/9] readded shell expansion --- .build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build.sh b/.build.sh index d957bd4..884ac88 100644 --- a/.build.sh +++ b/.build.sh @@ -6,4 +6,4 @@ set -x cargo build --release # tar binary files for upload -tar -czvf target/release/linux_amd64.tar.gz target/release/farm target/release/node target/release/plot target/release/wallet \ No newline at end of file +tar -czvf target/release/linux_amd64.tar.gz target/release/{farm,node,plot,wallet} \ No newline at end of file -- 2.47.0 From af2b7dab87d1ca9127c42ad68c3e8185daca0d89 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Mon, 14 Jun 2021 19:46:14 +0100 Subject: [PATCH 6/9] added executable bit --- .build.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .build.sh diff --git a/.build.sh b/.build.sh old mode 100644 new mode 100755 -- 2.47.0 From b43f9ae58b585795e68a32bd9ca59ec08fde5136 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Mon, 14 Jun 2021 19:47:22 +0100 Subject: [PATCH 7/9] removed expansion --- .build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build.sh b/.build.sh index 884ac88..c9cea63 100755 --- a/.build.sh +++ b/.build.sh @@ -6,4 +6,4 @@ set -x cargo build --release # tar binary files for upload -tar -czvf target/release/linux_amd64.tar.gz target/release/{farm,node,plot,wallet} \ No newline at end of file +tar -czvf target/release/linux_amd64.tar.gz target/release/farm target/release/node target/release/plot target/release/wallet -- 2.47.0 From 2b03fc3a9ff87bcefda03cfa1fe3ec66d2f8473b Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Mon, 14 Jun 2021 19:48:00 +0100 Subject: [PATCH 8/9] signed dronefile --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 51ee7b7..eb97e6e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -54,6 +54,6 @@ volumes: temp: {} --- kind: signature -hmac: d7c37edb0847754a42bb7ce0a5d1107690cd061201ac6e6154eef9845bbe0e80 +hmac: 91ad5c3d608ca8d5d0eb9ed54277099436549ab20636a323e40b8ba81b5bc14a ... -- 2.47.0 From 31354a87dc3e981612de92d3e694471dd1a9deb0 Mon Sep 17 00:00:00 2001 From: Jake Hillion Date: Mon, 14 Jun 2021 19:50:41 +0100 Subject: [PATCH 9/9] tar chdir --- .build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build.sh b/.build.sh index c9cea63..cd13048 100755 --- a/.build.sh +++ b/.build.sh @@ -6,4 +6,4 @@ set -x cargo build --release # tar binary files for upload -tar -czvf target/release/linux_amd64.tar.gz target/release/farm target/release/node target/release/plot target/release/wallet +tar -czvf target/release/linux_amd64.tar.gz -C target/release farm node plot wallet -- 2.47.0