Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ci): try fix boxes-test #11162

Merged
merged 4 commits into from
Jan 10, 2025
+9 −9
Merged

chore(ci): try fix boxes-test #11162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
930d9ed
chore(ci): try fix boxes-test
ludamad Jan 10, 2025
68587d0
Merge branch 'master' into ad/try-fix-boxes
ludamad Jan 10, 2025
da585a9
Try again to fix
ludamad0 Jan 10, 2025
58ad60b
Merge branch 'master' into ad/try-fix-boxes
ludamad Jan 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile.boxes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM aztecprotocol/ci:2.0
FROM aztecprotocol/ci:2.1
COPY /usr/src /usr/src
WORKDIR /usr/src/boxes
RUN ls /usr/src/boxes
Expand Down
6 changes: 3 additions & 3 deletions build-images/Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ ci:
ENV CI=1

ARG TARGETARCH
SAVE IMAGE --push aztecprotocol/ci:2.0-$TARGETARCH
SAVE IMAGE --push aztecprotocol/ci:2.0
SAVE IMAGE --push aztecprotocol/ci:2.1-$TARGETARCH
SAVE IMAGE --push aztecprotocol/ci:2.1

########################################################################################################################
# We want to produce downstream images: devbox and sysbox. This image is the base image for each.
Expand Down Expand Up @@ -477,7 +477,7 @@ aztec-base:
ARG TARGETARCH
SAVE IMAGE --push aztecprotocol/aztec-base:v1.0-$TARGETARCH

# Add a new target for end-to-end-base that corresponds to the portion of Dockerfile.end-to-end before COPY /usr/src
# Add a new target for end-to-end-base that corresponds to the portion of Dockerfile.end-to-end before COPY /usr/src.
end-to-end-base:
FROM ubuntu:noble
# Add our dev testing dependencies.
Expand Down
4 changes: 2 additions & 2 deletions ci3/aws/ami_update.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ scp -F build_instance_ssh_config $HOME/.aws/build_instance_credentials ubuntu@$i
# Download crs onto machine.
ssh -t -F build_instance_ssh_config ubuntu@$ip < ../../barretenberg/scripts/download_bb_crs.sh

# Pull ci:2.0 onto host, and build:2.0 into docker-in-docker volume.
# Pull ci:2.1 onto host, and build:2.0 into docker-in-docker volume.
ssh -t -F build_instance_ssh_config ubuntu@$ip '
docker run --privileged -ti --rm -v boostrap_ci_local_docker:/var/lib/docker aztecprotocol/ci:2.0 bash -c "
docker run --privileged -ti --rm -v boostrap_ci_local_docker:/var/lib/docker aztecprotocol/ci:2.1 bash -c "
/usr/local/share/docker-init.sh &> /dev/null
sleep 5
docker pull aztecprotocol/build:2.0
Expand Down
2 changes: 1 addition & 1 deletion ci3/bootstrap_ec2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ ssh -t -F $ci3/aws/build_instance_ssh_config ubuntu@$ip "
-v boostrap_ci_local_docker:/var/lib/docker \
-v \$HOME:/root \
-v /tmp:/tmp \
aztecprotocol/ci:2.0 bash -c '
aztecprotocol/ci:2.1 bash -c '
[ -n \"$GITHUB_LOG\" ] && echo "::endgroup::"
[ -n \"$GITHUB_LOG\" ] && echo "::group::Clone Repository"
set -e
Expand Down
2 changes: 1 addition & 1 deletion ci3/bootstrap_local
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ docker run --name aztec_build -ti --rm \
-v $root:/aztec-packages-host:ro \
-v $HOME/.aws:/root/.aws:ro \
-v $HOME/.bb-crs:/root/.bb-crs:ro \
aztecprotocol/ci:2.0 bash -c "
aztecprotocol/ci:2.1 bash -c "
set -e
/usr/local/share/docker-init.sh &> /dev/null
git config --global --add safe.directory /aztec-packages-host/.git
Expand Down
2 changes: 1 addition & 1 deletion ci3/bootstrap_local_noninteractive
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker run --rm \
-v bootstrap_ci_local_docker:/var/lib/docker \
-v $root:/aztec-packages-host:ro \
-v $HOME/.aws:/root/.aws \
aztecprotocol/ci:2.0 bash -c "
aztecprotocol/ci:2.1 bash -c "
/usr/local/share/docker-init.sh &> /dev/null
git config --global --add safe.directory /aztec-packages-host/.git
mkdir -p /root/aztec-packages && cd /root/aztec-packages
Expand Down
Loading