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.

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

fix: build cli image before releasing #3140

Merged
merged 1 commit into from
Oct 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 38 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,32 @@ jobs:
echo "export DOCKER_BUILDKIT=" > $BASH_ENV
build aztec-sandbox false arm64

cli-x86_64:
machine:
image: ubuntu-2204:2023.07.2
resource_class: large
steps:
- *checkout
- *setup_env
- run:
name: "Build and test"
command: build cli false x86_64

cli-arm64:
machine:
image: ubuntu-2204:2023.07.2
resource_class: arm.large
steps:
- *checkout
- *setup_env
- run:
name: "Build and test"
# We need to force not to use docker buildkit because for some reason on arm only, it ends up making a call
# out to eu-west2 despite the image being locally tagged, resulting in unauthorized 401. Weird docker bug?
command: |
echo "export DOCKER_BUILDKIT=" > $BASH_ENV
build cli false arm64

aztec-p2p-bootstrap:
machine:
image: ubuntu-2204:2023.07.2
Expand Down Expand Up @@ -547,6 +573,7 @@ jobs:
command: |
create_ecr_manifest aztec-sandbox x86_64,arm64
create_ecr_manifest pxe x86_64,arm64
create_ecr_manifest cli x86_64,arm64

boxes-blank-react:
machine:
Expand Down Expand Up @@ -1260,6 +1287,15 @@ workflows:
- yarn-project
<<: *defaults

- cli-x86_64:
requires:
- yarn-project
<<: *defaults
- cli-arm64:
requires:
- yarn-project
<<: *defaults

- aztec-p2p-bootstrap:
requires:
- yarn-project
Expand Down Expand Up @@ -1290,6 +1326,8 @@ workflows:
- aztec-sandbox-arm64
- pxe-x86_64
- pxe-arm64
- cli-x86_64
- cli-arm64
<<: *defaults

- boxes-blank-react:
Expand Down
2 changes: 1 addition & 1 deletion build_manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ aztec-faucet:
dependencies:
- yarn-project

aztec-cli:
cli:
buildDir: yarn-project
projectDir: yarn-project/cli
dependencies:
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/cli/aztec-cli
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ fi

# fallback on docker

CLI_IMAGE=${CLI_IMAGE:-"aztecprotocol/aztec-cli"}
CLI_IMAGE=${CLI_IMAGE:-"aztecprotocol/cli"}
CLI_VERSION=${CLI_VERSION:-"latest"}

DOCKER_PATH=""
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/deploy_dockerhub.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DIST_TAG=${1:-"latest"}
extract_repo yarn-project /usr/src project
PROJECT_ROOT=$(pwd)/project/src/

for REPOSITORY in "pxe" "aztec-sandbox"; do
for REPOSITORY in "pxe" "aztec-sandbox" "cli"; do
echo "Deploying $REPOSITORY $DIST_TAG"
RELATIVE_PROJECT_DIR=$(query_manifest relativeProjectDir $REPOSITORY)
cd "$PROJECT_ROOT/$RELATIVE_PROJECT_DIR"
Expand Down