From 6409afaefc5e7a5ceed7676c167dbdada0fc6800 Mon Sep 17 00:00:00 2001 From: Adam Shamblin Date: Mon, 20 Feb 2023 15:18:00 -0700 Subject: [PATCH] install capnproto from package, upgrade to 0.10.3 --- Earthfile | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/Earthfile b/Earthfile index a74ecafc..90a6f7db 100644 --- a/Earthfile +++ b/Earthfile @@ -7,17 +7,11 @@ FROM --platform amd64 ubuntu:16.04 # Install build prerequisites deps-base: RUN apt-get -y update - RUN apt-get install -y iproute2 curl build-essential cmake libssl-dev openssl file git pkg-config libdbus-1-dev libdbus-glib-1-dev libgirepository1.0-dev libcairo2-dev checkinstall unzip - -# Install Cap'n Proto -deps-capnp: - FROM +deps-base - COPY scripts/earthly/install_capnproto.sh / - RUN /bin/bash /install_capnproto.sh; rm /install_capnproto.sh + RUN apt-get install -y iproute2 curl build-essential cmake libssl-dev openssl file git pkg-config libdbus-1-dev libdbus-glib-1-dev libgirepository1.0-dev libcairo2-dev checkinstall unzip capnproto-c++-0.10.2 # Install protoc deps-protoc: - FROM +deps-capnp + FROM +deps-base COPY scripts/earthly/install_protoc.sh / RUN /bin/bash /install_protoc.sh; rm /install_protoc.sh @@ -147,4 +141,4 @@ package-linux-arm64: package-linux: BUILD +package-linux-amd64 - BUILD +package-linux-arm64 \ No newline at end of file + BUILD +package-linux-arm64