From 329b82fe7a62c7b2fb1a8e5fae89173cf9e184be Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Sat, 15 Aug 2020 08:14:37 +1000 Subject: [PATCH 1/3] Update Cargo.lock --- Cargo.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7722ecfb1ad..596b5121207 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,7 +2,7 @@ # It is not intended for manual editing. [[package]] name = "account_manager" -version = "0.2.0" +version = "0.2.3" dependencies = [ "account_utils", "bls", @@ -373,7 +373,7 @@ dependencies = [ [[package]] name = "beacon_node" -version = "0.2.2" +version = "0.2.3" dependencies = [ "beacon_chain", "clap", @@ -530,7 +530,7 @@ dependencies = [ [[package]] name = "boot_node" -version = "0.1.0" +version = "0.2.3" dependencies = [ "clap", "discv5", @@ -2894,7 +2894,7 @@ dependencies = [ [[package]] name = "lighthouse" -version = "0.2.2" +version = "0.2.3" dependencies = [ "account_manager", "account_utils", @@ -6022,7 +6022,7 @@ dependencies = [ [[package]] name = "validator_client" -version = "0.2.0" +version = "0.2.3" dependencies = [ "account_utils", "bls", From 03042358dcbba887e90114da6e480669a1258c41 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Sat, 15 Aug 2020 08:18:41 +1000 Subject: [PATCH 2/3] Add release building makefiles --- .gitignore | 1 + Makefile | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/.gitignore b/.gitignore index d5b3f72922c..570bb6cdf3a 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ target/ flamegraph.svg perf.data* *.tar.gz +bin/ diff --git a/Makefile b/Makefile index a93ef7ef68e..a2185ac175a 100644 --- a/Makefile +++ b/Makefile @@ -2,6 +2,13 @@ EF_TESTS = "testing/ef_tests" STATE_TRANSITION_VECTORS = "testing/state_transition_vectors" +GIT_TAG := $(shell git describe --tags --candidates 1) +BIN_DIR = "bin" + +X86_64_TAG = "x86_64-unknown-linux-gnu" +BUILD_PATH_X86_64 = "target/$(X86_64_TAG)/release" +AARCH64_TAG = "aarch64-unknown-linux-gnu" +BUILD_PATH_AARCH64 = "target/$(AARCH64_TAG)/release" # Builds the Lighthouse binary in release (optimized). # @@ -43,6 +50,32 @@ build-aarch64: build-aarch64-portable: cross build --release --manifest-path lighthouse/Cargo.toml --target aarch64-unknown-linux-gnu --features portable +# Create a `.tar.gz` containing a binary for a specific target. +define tarball_release_binary + cp $(1)/lighthouse $(BIN_DIR)/lighthouse + cd $(BIN_DIR) && \ + tar -czf lighthouse-$(GIT_TAG)-$(2)$(3).tar.gz lighthouse && \ + rm lighthouse +endef + +# Create a series of `.tar.gz` files in the BIN_DIR directory, each containing +# a `lighthouse` binary for a different target. +# +# The current git tag will be used as the version in the output file names. You +# will likely need to use `git tag` and create a semver tag (e.g., `v0.2.3`). +build-release-tarballs: + echo "Using git tag $(GIT_TAG) as the version for tarball filenames." + [ -d $(BIN_DIR) ] || mkdir -p $(BIN_DIR) + $(MAKE) build-x86_64 + $(call tarball_release_binary,$(BUILD_PATH_X86_64),$(X86_64_TAG),"") + $(MAKE) build-x86_64-portable + $(call tarball_release_binary,$(BUILD_PATH_X86_64),$(X86_64_TAG),"-portable") + $(MAKE) build-aarch64 + $(call tarball_release_binary,$(BUILD_PATH_AARCH64),$(AARCH64_TAG),"") + $(MAKE) build-aarch64-portable + $(call tarball_release_binary,$(BUILD_PATH_AARCH64),$(AARCH64_TAG),"-portable") + + # Runs the full workspace tests in **release**, without downloading any additional # test vectors. test-release: From d82e80e3219f24d224065b619b81057d8b312fda Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Sat, 15 Aug 2020 08:22:21 +1000 Subject: [PATCH 3/3] Remove echo --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index a2185ac175a..6fadf222f0a 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,6 @@ endef # The current git tag will be used as the version in the output file names. You # will likely need to use `git tag` and create a semver tag (e.g., `v0.2.3`). build-release-tarballs: - echo "Using git tag $(GIT_TAG) as the version for tarball filenames." [ -d $(BIN_DIR) ] || mkdir -p $(BIN_DIR) $(MAKE) build-x86_64 $(call tarball_release_binary,$(BUILD_PATH_X86_64),$(X86_64_TAG),"")