From 715b057b2347a3cc351c5473b077732067c948dc Mon Sep 17 00:00:00 2001 From: Pearson White Date: Mon, 14 Oct 2024 23:11:50 -0400 Subject: [PATCH] wip - testing --- build_native_in_docker.sh | 2 +- scripts/{boostrap.sh => bootstrap.sh} | 17 ++++++++++++++++- scripts/dependencies.sh | 2 ++ scripts/sequencer-ci.Dockerfile | 4 ++-- 4 files changed, 21 insertions(+), 4 deletions(-) rename scripts/{boostrap.sh => bootstrap.sh} (77%) diff --git a/build_native_in_docker.sh b/build_native_in_docker.sh index 176da0756f1..83f0cfe3aca 100755 --- a/build_native_in_docker.sh +++ b/build_native_in_docker.sh @@ -15,7 +15,7 @@ docker run \ -e CARGO_HOME=${HOME}/.cargo \ -u $UID \ -v /tmp:/tmp \ - -v "${HOME}:${HOME}" \ + -v "${HOME}:${HOME}:z" \ --workdir ${PWD} \ ${docker_image_name} \ "$@" diff --git a/scripts/boostrap.sh b/scripts/bootstrap.sh similarity index 77% rename from scripts/boostrap.sh rename to scripts/bootstrap.sh index 27eb0e8da93..54bfc17a277 100755 --- a/scripts/boostrap.sh +++ b/scripts/bootstrap.sh @@ -5,7 +5,7 @@ # Set SEQUENCER_DIR as first argument. [ "$#" -gt 0 ] || (echo "Path to sequencer repo required as an argument, $# arguments provided" ; exit 1) SEQUENCER_DIR="$1" -remaining_args=("${all_args[@]:1}") +remaining_args=${@:2} # Building the docker image builds libcairo_native_runtime.a, but the sequencer repo may not exist (on the docker image). # When running the github actions CI, `build_native_in_docker.sh` is called and mounts home. @@ -23,6 +23,21 @@ function copy_cairo_native_lib() { { set +x; } 2>/dev/null } +echo "asdf lib: " +ls -lsah /cairo_native/libcairo_native_runtime.a # asdf +echo "asdf dir: " +ls -lsah ${SEQUENCER_DIR} # asdf +echo "asdf dir2: " +ls -lsah ${SEQUENCER_DIR}/crates # asdf +echo "asdf dir3: " +ls -lsah ${SEQUENCER_DIR}/crates/blockifier # asdf +whoami # asdf +id -u # asdf +echo $UID # asdf +id sequencer # asdf +id -g # asdf +echo "remaining: $remaining_args" # asdf + copy_cairo_native_lib "${SEQUENCER_DIR}" # Run the passed in command using remaining arguments diff --git a/scripts/dependencies.sh b/scripts/dependencies.sh index 0996c1284e3..8e9134407f8 100755 --- a/scripts/dependencies.sh +++ b/scripts/dependencies.sh @@ -73,6 +73,8 @@ function compile_cairo_native_runtime() { mv ./cairo_native/target/release/libcairo_native_runtime.a ${LIBCAIRO_NATIVE_DIR}/libcairo_native_runtime.a rm -rf ./cairo_native + + ls -lsah ${LIBCAIRO_NATIVE_DIR}/libcairo_native_runtime.a # asdf } function main() { diff --git a/scripts/sequencer-ci.Dockerfile b/scripts/sequencer-ci.Dockerfile index 3c6d9e68eda..03eb9a32c70 100644 --- a/scripts/sequencer-ci.Dockerfile +++ b/scripts/sequencer-ci.Dockerfile @@ -22,8 +22,8 @@ ENV PATH=$PATH:${RUSTUP_HOME}/bin COPY install_build_tools.sh . COPY dependencies.sh . -COPY boostrap.sh . +COPY bootstrap.sh . RUN ./install_build_tools.sh /cairo_native -ENTRYPOINT [ "sh", "-c", "/cairo_native/boostrap.sh ${SEQUENCER_DIR} $0 $@" ] \ No newline at end of file +ENTRYPOINT [ "sh", "-c", "/cairo_native/bootstrap.sh ${SEQUENCER_DIR} $0 $@" ] \ No newline at end of file