From d0128474ae0541c796845550a577366a7804eaba Mon Sep 17 00:00:00 2001 From: Debanjan Basu Date: Sun, 19 May 2024 01:16:21 +1000 Subject: [PATCH] locked in capnp compiler version --- Earthfile | 4 ++-- veilid-core/build.rs | 10 +++++----- veilid-core/proto/veilid_capnp.rs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Earthfile b/Earthfile index ee078bf8..4cb5cd72 100644 --- a/Earthfile +++ b/Earthfile @@ -13,7 +13,7 @@ VERSION 0.7 # Start with older Ubuntu to ensure GLIBC symbol versioning support for older linux # Ensure we are using an amd64 platform because some of these targets use cross-platform tooling -FROM ubuntu:24.04 +FROM ubuntu:18.04 ENV ZIG_VERSION=0.13.0-dev.46+3648d7df1 ENV RUSTUP_HOME=/usr/local/rustup @@ -28,7 +28,7 @@ WORKDIR /veilid # Install build prerequisites & setup required directories 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 libncursesw5-dev libncurses5-dev capnproto + 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 libncursesw5-dev libncurses5-dev # Install Rust deps-rust: diff --git a/veilid-core/build.rs b/veilid-core/build.rs index f14bc1cd..0c804316 100644 --- a/veilid-core/build.rs +++ b/veilid-core/build.rs @@ -42,9 +42,9 @@ where return Ok(true); }; - // Check if capnp version hash has changed + // Check if desired CAPNP_VERSION hash has changed let mut hasher = Sha256::new(); - hasher.update(get_capnp_version_string().as_bytes()); + hasher.update(get_desired_capnp_version_string().as_bytes()); let capnp_hash = hex::encode(hasher.finalize()).as_bytes().to_vec(); let in_bh = make_build_hash(input); @@ -55,7 +55,7 @@ where } if out_capnp_hash != capnp_hash { - println!("cargo:warning=Capnp version hash has changed."); + println!("cargo:warning=Capnp desired version hash has changed."); return Ok(true); } @@ -84,7 +84,7 @@ fn get_build_hash_and_capnp_version_hash>( let l = l.unwrap(); if let Some(rest) = l.strip_prefix("//BUILDHASH:") { build_hash = Some(hex::decode(rest).unwrap()); - } else if let Some(rest) = l.strip_prefix("//CAPNPVERSIONHASH:") { + } else if let Some(rest) = l.strip_prefix("//CAPNPDESIREDVERSIONHASH:") { capnp_version_hash = Some(hex::decode(rest).unwrap()); } } @@ -113,7 +113,7 @@ fn append_hash_and_detected_capnp_version_hash, Q: AsRef>( hasher.update(get_capnp_version_string().as_bytes()); writeln!( out_file, - "\n//CAPNPVERSIONHASH:{}", + "\n//CAPNPDESIREDVERSIONHASH:{}", hex::encode(hasher.finalize()) ) .unwrap(); diff --git a/veilid-core/proto/veilid_capnp.rs b/veilid-core/proto/veilid_capnp.rs index 07d4f639..60f7fbf6 100644 --- a/veilid-core/proto/veilid_capnp.rs +++ b/veilid-core/proto/veilid_capnp.rs @@ -22244,4 +22244,4 @@ pub mod operation { //BUILDHASH:a28970f74fcf7989d47e1457e848e5de33d8b7a4003a0e439c95f442ecf69fd3 -//CAPNPVERSIONHASH:bfec2e34583ada7e6af2cb73993fb75a3f7147a6c943e5ff5f5c4294fc577b90 +//CAPNPDESIREDVERSIONHASH:bfec2e34583ada7e6af2cb73993fb75a3f7147a6c943e5ff5f5c4294fc577b90