diff --git a/.circleci/config.yml b/.circleci/config.yml index 96cd978f9c1..2a77de63ef2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -375,7 +375,12 @@ jobs: - *setup_env - run: name: Build - command: build noir-contracts-build + command: | + which build + which jq + which yq + cat $BASH_ENV + build noir-contracts-build yarn-project-base: machine: @@ -810,7 +815,7 @@ defaults: &defaults workflows: system: when: - equal: [ system, << pipeline.parameters.workflow >> ] + equal: [system, << pipeline.parameters.workflow >>] jobs: - barretenberg-wasm-linux-clang: <<: *defaults diff --git a/bootstrap.sh b/bootstrap.sh index 2c583c65680..e9900a48dfb 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -46,6 +46,7 @@ fi HOOKS_DIR=$(git rev-parse --git-path hooks) echo "(cd barretenberg/cpp && ./format.sh staged)" > $HOOKS_DIR/pre-commit echo "(cd circuits/cpp && ./format.sh staged)" >> $HOOKS_DIR/pre-commit +# TODO: Call cci_gen to ensure .circleci/config.yml is up-to-date! chmod +x $HOOKS_DIR/pre-commit git submodule update --init --recursive diff --git a/build_manifest.sh b/build_manifest.sh deleted file mode 100755 index a3fabee51c4..00000000000 --- a/build_manifest.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -# Source this file to define the PROJECTS variable, needed by build_local, used by bootstrap_docker.sh. -# -# PROJECT elements have structure PROJECT_NAME:WORKING_DIR:DOCKERFILE:REPO:LAUNCH. -# PROJECT_NAME: A name by which one can reference this project via the boostrap_docker.sh script. -# WORKING_DIR: Everything within this directory is copied into the docker context (excluding paths in .dockerignore). -# DOCKERFILE: Defaults to Dockerfile. However some projects have multiple build Dockerfiles located in subdirs. -# REPO: Defaults to . The docker repository name, used to name the resulting docker image. -# LAUNCH: If set, the container will be run. Use when testing is not done as part of the build. -# -# This file tells bootstrap_docker.sh which and in which order to build projects for locally testing the docker builds. -# To check *most* of the build works as expected, we can just do the minimum to produce the e2e tests, and run them -# locally to check they work. Other projects can be *temporarily* uncommented to test their Dockerfiles, but don't -# commit them, so that the most important build path remains fast and simple. - -PROJECTS=( - # bb-x86_64-linux-clang:barretenberg/cpp:./dockerfiles/Dockerfile.x86_64-linux-clang:barretenberg-x86_64-linux-clang - # bb-x86_64-linux-clang-assert:barretenberg/cpp:./dockerfiles/Dockerfile.x86_64-linux-clang-assert:barretenberg-x86_64-linux-clang-assert - # bb-x86_64-linux-gcc:barretenberg/cpp:./dockerfiles/Dockerfile.x86_64-linux-gcc:barretenberg-x86_64-linux-gcc - bb-wasm-linux-clang:barretenberg/cpp:./dockerfiles/Dockerfile.wasm-linux-clang:barretenberg-wasm-linux-clang - # bb-x86:barretenberg/cpp:./dockerfiles/Dockerfile.x86_64-linux-clang-assert:barretenberg-x86_64-linux-clang-assert - # bb.js:barretenberg/ts:Dockerfile:bb.js::1 - # run-acir-tests-bb:barretenberg/acir_tests:Dockerfile.bb - # run-acir-tests-bb.js:barretenberg/acir_tests:Dockerfile.bb.js - # circuits-x86_64-linux-clang:circuits/cpp:./dockerfiles/Dockerfile.x86_64-linux-clang:circuits-x86_64-linux-clang - # circuits-x86_64-linux-clang-assert:circuits/cpp:./dockerfiles/Dockerfile.x86_64-linux-clang-assert:circuits-x86_64-linux-clang-assert - # circuits-wasm-linux-clang:circuits/cpp:./dockerfiles/Dockerfile.wasm-linux-clang:circuits-wasm-linux-clang - l1-contracts:l1-contracts - noir-contracts:yarn-project:noir-contracts/Dockerfile.build:noir-contracts-build - yarn-project-base-deps:yarn-project:yarn-project-base/Dockerfile.deps - yarn-project-base:yarn-project - end-to-end:yarn-project - aztec-sandbox:yarn-project -)