From f3eac5282860c1954ea2cee6a21633df5b1865fd Mon Sep 17 00:00:00 2001 From: sklppy88 <152162806+sklppy88@users.noreply.github.com> Date: Tue, 28 Nov 2023 22:20:56 +0100 Subject: [PATCH] fix: docker builds (#3620) initial --- scripts/bootstrap_native.sh | 8 +++++--- scripts/bootstrap_packages.sh | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/bootstrap_native.sh b/scripts/bootstrap_native.sh index 26cd44704aa..693a9d9678e 100755 --- a/scripts/bootstrap_native.sh +++ b/scripts/bootstrap_native.sh @@ -4,11 +4,13 @@ set -eu cd $(dirname "$0")/.. # If this project has been subrepod into another project, set build data manually. +export SOURCE_DATE_EPOCH=$(date +%s) +export GIT_DIRTY=false if [ -f ".gitrepo" ]; then - export SOURCE_DATE_EPOCH=$(date +%s) - export GIT_DIRTY=false export GIT_COMMIT=$(awk '/commit =/ {print $3}' .gitrepo) +else + export GIT_COMMIT=$(git rev-parse --verify HEAD) fi # Build native. -cargo build --features="noirc_frontend/aztec" --release \ No newline at end of file +cargo build --features="noirc_driver/aztec" --release diff --git a/scripts/bootstrap_packages.sh b/scripts/bootstrap_packages.sh index 552ddd7597a..5fce2675037 100755 --- a/scripts/bootstrap_packages.sh +++ b/scripts/bootstrap_packages.sh @@ -6,13 +6,15 @@ cd $(dirname "$0")/.. ./scripts/install_wasm-bindgen.sh # If this project has been subrepod into another project, set build data manually. +export SOURCE_DATE_EPOCH=$(date +%s) +export GIT_DIRTY=false if [ -f ".gitrepo" ]; then - export SOURCE_DATE_EPOCH=$(date +%s) - export GIT_DIRTY=false export GIT_COMMIT=$(awk '/commit =/ {print $3}' .gitrepo) +else + export GIT_COMMIT=$(git rev-parse --verify HEAD) fi -export cargoExtraArgs="--features noirc_frontend/aztec" +export cargoExtraArgs="--features noirc_driver/aztec" yarn yarn build