From f224fb90ef2f1390fa19e04f864500507a8f249a Mon Sep 17 00:00:00 2001 From: Adam Shamblin Date: Mon, 20 Feb 2023 15:56:53 -0700 Subject: [PATCH 1/2] parameterize install capnproto --- Earthfile | 4 ++-- scripts/earthly/install_capnproto.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Earthfile b/Earthfile index a74ecafc..3f1afe83 100644 --- a/Earthfile +++ b/Earthfile @@ -13,7 +13,7 @@ deps-base: deps-capnp: FROM +deps-base COPY scripts/earthly/install_capnproto.sh / - RUN /bin/bash /install_capnproto.sh; rm /install_capnproto.sh + RUN /bin/bash /install_capnproto.sh; rm /install_capnproto.sh 1 # Install protoc deps-protoc: @@ -147,4 +147,4 @@ package-linux-arm64: package-linux: BUILD +package-linux-amd64 - BUILD +package-linux-arm64 \ No newline at end of file + BUILD +package-linux-arm64 diff --git a/scripts/earthly/install_capnproto.sh b/scripts/earthly/install_capnproto.sh index 69ae43df..97d6e774 100755 --- a/scripts/earthly/install_capnproto.sh +++ b/scripts/earthly/install_capnproto.sh @@ -5,7 +5,7 @@ curl -O https://capnproto.org/capnproto-c++-0.10.2.tar.gz tar zxf capnproto-c++-0.10.2.tar.gz cd capnproto-c++-0.10.2 ./configure --without-openssl -make -j6 check +make -j$1 check if [ "$EUID" -ne 0 ]; then if command -v checkinstall &> /dev/null; then sudo checkinstall -y From 6e0673a3857f62bf3c2d14604a40ebed090a93c6 Mon Sep 17 00:00:00 2001 From: Adam Shamblin Date: Mon, 20 Feb 2023 16:06:38 -0700 Subject: [PATCH 2/2] fix typo --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 3f1afe83..fae4e054 100644 --- a/Earthfile +++ b/Earthfile @@ -13,7 +13,7 @@ deps-base: deps-capnp: FROM +deps-base COPY scripts/earthly/install_capnproto.sh / - RUN /bin/bash /install_capnproto.sh; rm /install_capnproto.sh 1 + RUN /bin/bash /install_capnproto.sh 1; rm /install_capnproto.sh # Install protoc deps-protoc: