Skip to content

Commit

Permalink
chore: nuking CLI
Browse files Browse the repository at this point in the history
  • Loading branch information
benesjan committed Apr 19, 2024
1 parent 4d04f0e commit 1cf831d
Show file tree
Hide file tree
Showing 61 changed files with 10 additions and 4,166 deletions.
14 changes: 0 additions & 14 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -443,18 +443,6 @@ jobs:
command: build aztec
aztec_manifest_key: aztec

cli:
machine:
image: default
resource_class: large
steps:
- *checkout
- *setup_env
- run:
name: "Build and test"
command: build cli
aztec_manifest_key: cli

mainnet-fork:
machine:
image: default
Expand Down Expand Up @@ -621,7 +609,6 @@ jobs:
should_release || exit 0
deploy_dockerhub noir
deploy_dockerhub aztec
deploy_dockerhub cli
deploy_dockerhub aztec-faucet
deploy_dockerhub mainnet-fork
- run:
Expand Down Expand Up @@ -851,7 +838,6 @@ workflows:

# Artifacts
- aztec-package: *defaults_yarn_project
- cli: *defaults_yarn_project

# Boxes.
- boxes:
Expand Down
3 changes: 0 additions & 3 deletions aztec-up/bin/aztec-install
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ function title() {
fi
echo -e "This will install the following scripts and update your PATH if necessary:"
echo -e " ${bold}${g}aztec${r} - launches various infrastructure subsystems (node, sequencer, prover, pxe, etc)."
echo -e " ${bold}${g}aztec-cli${r} - a command line tool for interfacing and experimenting with infrastructure."
echo -e " ${bold}${g}aztec-nargo${r} - aztec's build of nargo, the noir compiler toolchain."
echo -e " ${bold}${g}aztec-sandbox${r} - a wrapper around docker-compose that launches services needed for sandbox testing."
echo -e " ${bold}${g}aztec-up${r} - a tool to upgrade the aztec toolchain to the latest, or specific versions."
Expand Down Expand Up @@ -106,7 +105,6 @@ export DOCKER_CLI_HINTS=false
if [ -z "${SKIP_PULL:-}" ]; then
info "Pulling aztec version $VERSION..."
pull_container aztec
pull_container cli
pull_container noir
fi

Expand All @@ -123,7 +121,6 @@ info "Installing scripts in $BIN_PATH..."
rm -f $BIN_PATH/aztec*
install_bin .aztec-run
install_bin aztec
install_bin aztec-cli
install_bin aztec-sandbox
install_bin aztec-up
install_bin aztec-nargo
Expand Down
1 change: 0 additions & 1 deletion boxes/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ COPY --from=noir-projects /usr/src/noir-projects/noir-protocol-circuits/crates/t
WORKDIR /usr/src/boxes
COPY . .
ENV AZTEC_NARGO=/usr/src/noir/noir-repo/target/release/nargo
ENV AZTEC_CLI=/usr/src/yarn-project/cli/aztec-cli-dest
RUN yarn
RUN npx -y [email protected] install --with-deps
ENTRYPOINT ["/bin/sh", "-c"]
1 change: 0 additions & 1 deletion boxes/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ build:
WORKDIR /usr/src/boxes
COPY . .
ENV AZTEC_NARGO=/usr/src/noir/noir-repo/target/release/nargo
ENV AZTEC_CLI=/usr/src/yarn-project/cli/aztec-cli-dest
RUN yarn && yarn build
RUN npx -y [email protected] install --with-deps
ENTRYPOINT ["/bin/sh", "-c"]
10 changes: 0 additions & 10 deletions build_manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ yarn-project-test:
rebuildPatterns:
- ^yarn-project/.*\.(ts|tsx|js|cjs|mjs|json|html|md|sh|nr|toml|snap)$
- ^yarn-project/Dockerfile$
- ^yarn-project/cli/aztec-cli
dependencies:
- bb.js
- noir-packages
Expand Down Expand Up @@ -185,7 +184,6 @@ yarn-project:
rebuildPatterns:
- ^yarn-project/.*\.(ts|tsx|js|cjs|mjs|json|html|md|sh|nr|toml|snap)$
- ^yarn-project/Dockerfile$
- ^yarn-project/cli/aztec-cli
dependencies:
- bb.js
- noir-packages
Expand All @@ -211,14 +209,6 @@ aztec-faucet:
- bb.js
- noir-packages

# A runnable container, sets entrypoint to be the aztec-cli entrypoint.
cli:
buildDir: yarn-project
projectDir: yarn-project/cli
dependencies:
- yarn-project
multiarch: buildx

# Builds all the boxes. They are then independently tested in the container.
boxes:
buildDir: boxes
Expand Down
6 changes: 1 addition & 5 deletions release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,6 @@
"component": "aztec-packages",
"package-name": "aztec-packages"
},
"yarn-project/cli": {
"release-type": "node",
"component": "aztec-cli"
},
"yarn-project/aztec": {
"release-type": "node",
"component": "aztec-package"
Expand All @@ -48,7 +44,7 @@
{
"type": "linked-versions",
"groupName": "aztec-packages",
"components": ["barretenberg", "barretenberg.js", "aztec-packages", "aztec-package", "aztec-cli"]
"components": ["barretenberg", "barretenberg.js", "aztec-packages", "aztec-package"]
},
"sentence-case"
]
Expand Down
2 changes: 1 addition & 1 deletion yarn-project/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN ln -s /usr/src/yarn-project/node_modules /usr/src/node_modules
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true

RUN ./bootstrap.sh
RUN yarn workspaces focus @aztec/cli @aztec/aztec --production && yarn cache clean
RUN yarn workspaces focus @aztec/aztec --production && yarn cache clean

# TODO: Use release-please to update package.json directly, and remove this!
# It's here to ensure the image rebuilds if the commit tag changes (as the content hash won't).
Expand Down
7 changes: 1 addition & 6 deletions yarn-project/Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ build:

aztec-prod:
FROM +build
RUN yarn workspaces focus @aztec/cli @aztec/aztec --production && yarn cache clean
RUN yarn workspaces focus @aztec/aztec --production && yarn cache clean
SAVE ARTIFACT /usr/src /usr/src

aztec-prod-slim:
Expand All @@ -61,11 +61,6 @@ aztec:
ENTRYPOINT ["node", "--no-warnings", "/usr/src/yarn-project/aztec/dest/bin/index.js"]
EXPOSE 8080

cli:
FROM +aztec-prod-slim
ENTRYPOINT ["node", "--no-warnings", "/usr/src/yarn-project/cli/dest/bin/index.js"]
EXPOSE 8080

end-to-end-prod:
FROM +build
RUN yarn workspaces focus @aztec/end-to-end --production && yarn cache clean
Expand Down
1 change: 0 additions & 1 deletion yarn-project/cli/.eslintrc.cjs

This file was deleted.

221 changes: 0 additions & 221 deletions yarn-project/cli/CHANGELOG.md

This file was deleted.

10 changes: 0 additions & 10 deletions yarn-project/cli/Dockerfile

This file was deleted.

Loading

0 comments on commit 1cf831d

Please sign in to comment.