From 14387e81693112903f9269b62b8c73cee437cca5 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Sun, 3 Sep 2023 15:34:48 +0000 Subject: [PATCH 1/6] feat: get docs compiling in docker container --- docs/.dockerignore | 31 ++ docs/Dockerfile | 10 + docs/build.sh | 9 + .../dev_docs/contracts/state_variables.md | 14 +- docs/package.json | 10 +- docs/yarn.lock | 423 +++++++++--------- 6 files changed, 276 insertions(+), 221 deletions(-) create mode 100644 docs/.dockerignore create mode 100644 docs/Dockerfile create mode 100755 docs/build.sh diff --git a/docs/.dockerignore b/docs/.dockerignore new file mode 100644 index 000000000000..8e534366f15e --- /dev/null +++ b/docs/.dockerignore @@ -0,0 +1,31 @@ +*.node_modules +*.docusaurus +*.processed-docs +*.processed-docs-cache +*Dockerfile +*.CONTRIBUTING.md +*.LICENSE +*/build/ +*/build-wasm/ +*/build-coverage/ + +# Ignore C++ object files and executables +*.o +*.out +*.exe +*.so +*.a +*/build/ +*/Debug/ +*/Release/ + +/barretenberg/ + +# Ignore Node.js build artifacts +*/node_modules/ +*.log +npm-debug.log +yarn.lock +yarn-error.log +package-lock.json +dist/ diff --git a/docs/Dockerfile b/docs/Dockerfile new file mode 100644 index 000000000000..572658476eb6 --- /dev/null +++ b/docs/Dockerfile @@ -0,0 +1,10 @@ +FROM node:18-alpine +RUN apk update + +WORKDIR /usr/src + +COPY . . + +WORKDIR /usr/src/docs + +RUN yarn && yarn build \ No newline at end of file diff --git a/docs/build.sh b/docs/build.sh new file mode 100755 index 000000000000..b1d692211fa2 --- /dev/null +++ b/docs/build.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# Temporarily copy the docker ignore into the core context +cp .dockerignore .. + +# Build in the root context +(cd .. && docker build . -f docs/Dockerfile) + +rm ../.dockerignore \ No newline at end of file diff --git a/docs/docs/dev_docs/contracts/state_variables.md b/docs/docs/dev_docs/contracts/state_variables.md index 14f5b794f074..e1176840d8e3 100644 --- a/docs/docs/dev_docs/contracts/state_variables.md +++ b/docs/docs/dev_docs/contracts/state_variables.md @@ -8,7 +8,8 @@ Public state is persistent state that is _publicly visible_ to anyone in the wor For developers coming from other blockchain ecosystems (such as Ethereum), this will be a familiar concept, because there, _all_ state is _publicly visible_. -Aztec public state follows an account-based model. That is, each state occupies a leaf in an account-based merkle tree: the [_public state tree_](INSERT_LINK_HERE). See [here] (INSERT_LINK_HERE) for more of the technical details. +Aztec public state follows an account-based model. That is, each state occupies a leaf in an account-based merkle tree: the _public state tree_ (INSERT LINK HERE). See _here_ (INSERT LINK HERE) for more of the technical details. + The `PublicState` struct serves as a wrapper around conventional Noir types `T`, allowing these types to be written to and read from the public state tree. @@ -90,9 +91,11 @@ For example, the following function calls the account contract before it updates In contrast to public state, private state is persistent state that is _not_ visible to the whole world. Depending on the logic of the smart contract, a _private_ state variable's current value will only be known to one entity, or a closed group of entities. -The value of a private state variable can either be shared via an [encrypted log](INSERT_LINK_HERE), or offchain via web2, or completely offline: it's up to the app developer. +The value of a private state variable can either be shared via an _encrypted log_ (INSERT_LINK_HERE), or offchain via web2, or completely offline: it's up to the app developer. + -Aztec private state follows a utxo-based model. That is, a private state's current value is represented as one or many [notes](#notes). Each note is stored as an individual leaf in a utxo-based merkle tree: the [_private state tree_](INSERT_LINK_HERE). +Aztec private state follows a utxo-based model. That is, a private state's current value is represented as one or many [notes](#notes). Each note is stored as an individual leaf in a utxo-based merkle tree: the _private state tree_ (INSERT_LINK_HERE). + To greatly simplify the experience of writing private state, Aztec.nr provides three different types of private state variable: @@ -227,7 +230,8 @@ This function returns the notes the account has access to: #include_code state_vars-SetGet /yarn-project/noir-contracts/src/contracts/docs_example_contract/src/actions.nr rust -There's a limit on the maxinum number of notes this function can return at a time. Check [here](INSERT_LINK_HERE) and look for `MAX_READ_REQUESTS_PER_CALL` for the up-to-date number. +There's a limit on the maxinum number of notes this function can return at a time. Check _here_ (INSERT_LINK_HERE) and look for `MAX_READ_REQUESTS_PER_CALL` for the up-to-date number. + Because of this limit, we should always consider using the second argument `NoteGetterOptions` to target the notes we need, and to reduce the time required to recursively call this function. @@ -245,7 +249,7 @@ For example, the following function outputs an instance of `NoteGetterOptions`, The first value of `.select` and `.sort` is the index of a field in a note type. For the note type `CardNote` that has the following fields: -#include_code state_vars-CardNote /yarn-project/noir-contracts/src/contracts/docs_example_contract/src/types/card.nr rust +#include_code state_vars-CardNote /yarn-project/noir-contracts/src/contracts/docs_example_contract/src/types/card_note.nr rust The indices are: 0 for `points`, 1 for `secret`, and 2 for `owner`. diff --git a/docs/package.json b/docs/package.json index 380b97890e78..b3017e9b2b22 100644 --- a/docs/package.json +++ b/docs/package.json @@ -19,10 +19,10 @@ "update-specs": "./scripts/update_specs.sh" }, "dependencies": { - "@docusaurus/core": "^2.3.1", - "@docusaurus/plugin-ideal-image": "^2.3.1", - "@docusaurus/preset-classic": "^2.3.1", - "@docusaurus/theme-mermaid": "^2.3.1", + "@docusaurus/core": "^2.4.1", + "@docusaurus/plugin-ideal-image": "^2.4.1", + "@docusaurus/preset-classic": "^2.4.1", + "@docusaurus/theme-mermaid": "^2.4.1", "@mdx-js/react": "^1.6.22", "axios": "^1.4.0", "clsx": "^1.1.1", @@ -35,7 +35,7 @@ "remark-math": "3" }, "devDependencies": { - "@docusaurus/module-type-aliases": "^2.3.1", + "@docusaurus/module-type-aliases": "^2.4.1", "@tsconfig/docusaurus": "^1.0.5", "concurrently": "^8.0.1", "nodemon": "^3.0.1", diff --git a/docs/yarn.lock b/docs/yarn.lock index 5e2702cf9b86..6b47a0365228 100644 --- a/docs/yarn.lock +++ b/docs/yarn.lock @@ -1229,10 +1229,10 @@ "@docsearch/css" "3.3.2" algoliasearch "^4.0.0" -"@docusaurus/core@2.3.1", "@docusaurus/core@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.3.1.tgz#32849f2ffd2f086a4e55739af8c4195c5eb386f2" - integrity sha512-0Jd4jtizqnRAr7svWaBbbrCCN8mzBNd2xFLoT/IM7bGfFie5y58oz97KzXliwiLY3zWjqMXjQcuP1a5VgCv2JA== +"@docusaurus/core@2.4.1", "@docusaurus/core@^2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/core/-/core-2.4.1.tgz#4b8ff5766131ce3fbccaad0b1daf2ad4dc76f62d" + integrity sha512-SNsY7PshK3Ri7vtsLXVeAJGS50nJN3RgF836zkyUfAD01Fq+sAk5EwWgLw+nnm5KVNGDu7PRR2kRGDsWvqpo0g== dependencies: "@babel/core" "^7.18.6" "@babel/generator" "^7.18.7" @@ -1244,13 +1244,13 @@ "@babel/runtime" "^7.18.6" "@babel/runtime-corejs3" "^7.18.6" "@babel/traverse" "^7.18.8" - "@docusaurus/cssnano-preset" "2.3.1" - "@docusaurus/logger" "2.3.1" - "@docusaurus/mdx-loader" "2.3.1" + "@docusaurus/cssnano-preset" "2.4.1" + "@docusaurus/logger" "2.4.1" + "@docusaurus/mdx-loader" "2.4.1" "@docusaurus/react-loadable" "5.5.2" - "@docusaurus/utils" "2.3.1" - "@docusaurus/utils-common" "2.3.1" - "@docusaurus/utils-validation" "2.3.1" + "@docusaurus/utils" "2.4.1" + "@docusaurus/utils-common" "2.4.1" + "@docusaurus/utils-validation" "2.4.1" "@slorber/static-site-generator-webpack-plugin" "^4.0.7" "@svgr/webpack" "^6.2.1" autoprefixer "^10.4.7" @@ -1306,44 +1306,44 @@ webpack-merge "^5.8.0" webpackbar "^5.0.2" -"@docusaurus/cssnano-preset@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.3.1.tgz#e042487655e3e062417855e12edb3f6eee8f5ecb" - integrity sha512-7mIhAROES6CY1GmCjR4CZkUfjTL6B3u6rKHK0ChQl2d1IevYXq/k/vFgvOrJfcKxiObpMnE9+X6R2Wt1KqxC6w== +"@docusaurus/cssnano-preset@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/cssnano-preset/-/cssnano-preset-2.4.1.tgz#eacadefb1e2e0f59df3467a0fe83e4ff79eed163" + integrity sha512-ka+vqXwtcW1NbXxWsh6yA1Ckii1klY9E53cJ4O9J09nkMBgrNX3iEFED1fWdv8wf4mJjvGi5RLZ2p9hJNjsLyQ== dependencies: cssnano-preset-advanced "^5.3.8" postcss "^8.4.14" postcss-sort-media-queries "^4.2.1" tslib "^2.4.0" -"@docusaurus/logger@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.3.1.tgz#d76aefb452e3734b4e0e645efc6cbfc0aae52869" - integrity sha512-2lAV/olKKVr9qJhfHFCaqBIl8FgYjbUFwgUnX76+cULwQYss+42ZQ3grHGFvI0ocN2X55WcYe64ellQXz7suqg== +"@docusaurus/logger@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/logger/-/logger-2.4.1.tgz#4d2c0626b40752641f9fdd93ad9b5a7a0792f767" + integrity sha512-5h5ysIIWYIDHyTVd8BjheZmQZmEgWDR54aQ1BX9pjFfpyzFo5puKXKYrYJXbjEHGyVhEzmB9UXwbxGfaZhOjcg== dependencies: chalk "^4.1.2" tslib "^2.4.0" -"@docusaurus/lqip-loader@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/lqip-loader/-/lqip-loader-2.3.1.tgz#eba7832067a6cb96aa12fff198cfe804bdb60139" - integrity sha512-pdZUh6FjvoVszGTaMHX4nhLfORdQ7ZnOv9wcfncsiR/iUzpHin+Dq3yOXPgB9C/yPvsaITzpCrJdGYfET29/dQ== +"@docusaurus/lqip-loader@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/lqip-loader/-/lqip-loader-2.4.1.tgz#5e6a279982af898e646f042097fc4053fa15b4b8" + integrity sha512-XJ0z/xSx5HtAQ+/xBoAiRZ7DY9zEP6IImAKlAk6RxuFzyB4HT8eINWN+LwLnOsTh5boIj37JCX+T76bH0ieULA== dependencies: - "@docusaurus/logger" "2.3.1" + "@docusaurus/logger" "2.4.1" file-loader "^6.2.0" lodash "^4.17.21" sharp "^0.30.7" tslib "^2.4.0" -"@docusaurus/mdx-loader@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.3.1.tgz#7ec6acee5eff0a280e1b399ea4dd690b15a793f7" - integrity sha512-Gzga7OsxQRpt3392K9lv/bW4jGppdLFJh3luKRknCKSAaZrmVkOQv2gvCn8LAOSZ3uRg5No7AgYs/vpL8K94lA== +"@docusaurus/mdx-loader@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/mdx-loader/-/mdx-loader-2.4.1.tgz#6425075d7fc136dbfdc121349060cedd64118393" + integrity sha512-4KhUhEavteIAmbBj7LVFnrVYDiU51H5YWW1zY6SmBSte/YLhDutztLTBE0PQl1Grux1jzUJeaSvAzHpTn6JJDQ== dependencies: "@babel/parser" "^7.18.8" "@babel/traverse" "^7.18.8" - "@docusaurus/logger" "2.3.1" - "@docusaurus/utils" "2.3.1" + "@docusaurus/logger" "2.4.1" + "@docusaurus/utils" "2.4.1" "@mdx-js/mdx" "^1.6.22" escape-html "^1.0.3" file-loader "^6.2.0" @@ -1358,13 +1358,13 @@ url-loader "^4.1.1" webpack "^5.73.0" -"@docusaurus/module-type-aliases@2.3.1", "@docusaurus/module-type-aliases@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-2.3.1.tgz#986186200818fed999be2e18d6c698eaf4683a33" - integrity sha512-6KkxfAVOJqIUynTRb/tphYCl+co3cP0PlHiMDbi+SzmYxMdgIrwYqH9yAnGSDoN6Jk2ZE/JY/Azs/8LPgKP48A== +"@docusaurus/module-type-aliases@2.4.1", "@docusaurus/module-type-aliases@^2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/module-type-aliases/-/module-type-aliases-2.4.1.tgz#38b3c2d2ae44bea6d57506eccd84280216f0171c" + integrity sha512-gLBuIFM8Dp2XOCWffUDSjtxY7jQgKvYujt7Mx5s4FCTfoL5dN1EVbnrn+O2Wvh8b0a77D57qoIDY7ghgmatR1A== dependencies: "@docusaurus/react-loadable" "5.5.2" - "@docusaurus/types" "2.3.1" + "@docusaurus/types" "2.4.1" "@types/history" "^4.7.11" "@types/react" "*" "@types/react-router-config" "*" @@ -1372,18 +1372,18 @@ react-helmet-async "*" react-loadable "npm:@docusaurus/react-loadable@5.5.2" -"@docusaurus/plugin-content-blog@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.3.1.tgz#236b8ee4f20f7047aa9c285ae77ae36683ad48a3" - integrity sha512-f5LjqX+9WkiLyGiQ41x/KGSJ/9bOjSD8lsVhPvYeUYHCtYpuiDKfhZE07O4EqpHkBx4NQdtQDbp+aptgHSTuiw== - dependencies: - "@docusaurus/core" "2.3.1" - "@docusaurus/logger" "2.3.1" - "@docusaurus/mdx-loader" "2.3.1" - "@docusaurus/types" "2.3.1" - "@docusaurus/utils" "2.3.1" - "@docusaurus/utils-common" "2.3.1" - "@docusaurus/utils-validation" "2.3.1" +"@docusaurus/plugin-content-blog@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-blog/-/plugin-content-blog-2.4.1.tgz#c705a8b1a36a34f181dcf43b7770532e4dcdc4a3" + integrity sha512-E2i7Knz5YIbE1XELI6RlTnZnGgS52cUO4BlCiCUCvQHbR+s1xeIWz4C6BtaVnlug0Ccz7nFSksfwDpVlkujg5Q== + dependencies: + "@docusaurus/core" "2.4.1" + "@docusaurus/logger" "2.4.1" + "@docusaurus/mdx-loader" "2.4.1" + "@docusaurus/types" "2.4.1" + "@docusaurus/utils" "2.4.1" + "@docusaurus/utils-common" "2.4.1" + "@docusaurus/utils-validation" "2.4.1" cheerio "^1.0.0-rc.12" feed "^4.2.2" fs-extra "^10.1.0" @@ -1394,18 +1394,18 @@ utility-types "^3.10.0" webpack "^5.73.0" -"@docusaurus/plugin-content-docs@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.3.1.tgz#feae1555479558a55182f22f8a07acc5e0d7444d" - integrity sha512-DxztTOBEruv7qFxqUtbsqXeNcHqcVEIEe+NQoI1oi2DBmKBhW/o0MIal8lt+9gvmpx3oYtlwmLOOGepxZgJGkw== - dependencies: - "@docusaurus/core" "2.3.1" - "@docusaurus/logger" "2.3.1" - "@docusaurus/mdx-loader" "2.3.1" - "@docusaurus/module-type-aliases" "2.3.1" - "@docusaurus/types" "2.3.1" - "@docusaurus/utils" "2.3.1" - "@docusaurus/utils-validation" "2.3.1" +"@docusaurus/plugin-content-docs@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-docs/-/plugin-content-docs-2.4.1.tgz#ed94d9721b5ce7a956fb01cc06c40d8eee8dfca7" + integrity sha512-Lo7lSIcpswa2Kv4HEeUcGYqaasMUQNpjTXpV0N8G6jXgZaQurqp7E8NGYeGbDXnb48czmHWbzDL4S3+BbK0VzA== + dependencies: + "@docusaurus/core" "2.4.1" + "@docusaurus/logger" "2.4.1" + "@docusaurus/mdx-loader" "2.4.1" + "@docusaurus/module-type-aliases" "2.4.1" + "@docusaurus/types" "2.4.1" + "@docusaurus/utils" "2.4.1" + "@docusaurus/utils-validation" "2.4.1" "@types/react-router-config" "^5.0.6" combine-promises "^1.1.0" fs-extra "^10.1.0" @@ -1416,112 +1416,112 @@ utility-types "^3.10.0" webpack "^5.73.0" -"@docusaurus/plugin-content-pages@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.3.1.tgz#f534a37862be5b3f2ba5b150458d7527646b6f39" - integrity sha512-E80UL6hvKm5VVw8Ka8YaVDtO6kWWDVUK4fffGvkpQ/AJQDOg99LwOXKujPoICC22nUFTsZ2Hp70XvpezCsFQaA== - dependencies: - "@docusaurus/core" "2.3.1" - "@docusaurus/mdx-loader" "2.3.1" - "@docusaurus/types" "2.3.1" - "@docusaurus/utils" "2.3.1" - "@docusaurus/utils-validation" "2.3.1" +"@docusaurus/plugin-content-pages@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-content-pages/-/plugin-content-pages-2.4.1.tgz#c534f7e49967699a45bbe67050d1605ebbf3d285" + integrity sha512-/UjuH/76KLaUlL+o1OvyORynv6FURzjurSjvn2lbWTFc4tpYY2qLYTlKpTCBVPhlLUQsfyFnshEJDLmPneq2oA== + dependencies: + "@docusaurus/core" "2.4.1" + "@docusaurus/mdx-loader" "2.4.1" + "@docusaurus/types" "2.4.1" + "@docusaurus/utils" "2.4.1" + "@docusaurus/utils-validation" "2.4.1" fs-extra "^10.1.0" tslib "^2.4.0" webpack "^5.73.0" -"@docusaurus/plugin-debug@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-2.3.1.tgz#26fef904713e148f6dee44957506280f8b7853bb" - integrity sha512-Ujpml1Ppg4geB/2hyu2diWnO49az9U2bxM9Shen7b6qVcyFisNJTkVG2ocvLC7wM1efTJcUhBO6zAku2vKJGMw== +"@docusaurus/plugin-debug@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-debug/-/plugin-debug-2.4.1.tgz#461a2c77b0c5a91b2c05257c8f9585412aaa59dc" + integrity sha512-7Yu9UPzRShlrH/G8btOpR0e6INFZr0EegWplMjOqelIwAcx3PKyR8mgPTxGTxcqiYj6hxSCRN0D8R7YrzImwNA== dependencies: - "@docusaurus/core" "2.3.1" - "@docusaurus/types" "2.3.1" - "@docusaurus/utils" "2.3.1" + "@docusaurus/core" "2.4.1" + "@docusaurus/types" "2.4.1" + "@docusaurus/utils" "2.4.1" fs-extra "^10.1.0" react-json-view "^1.21.3" tslib "^2.4.0" -"@docusaurus/plugin-google-analytics@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.3.1.tgz#e2e7db4cf6a7063e8ba5e128d4e413f4d6a0c862" - integrity sha512-OHip0GQxKOFU8n7gkt3TM4HOYTXPCFDjqKbMClDD3KaDnyTuMp/Zvd9HSr770lLEscgPWIvzhJByRAClqsUWiQ== +"@docusaurus/plugin-google-analytics@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-analytics/-/plugin-google-analytics-2.4.1.tgz#30de1c35773bf9d52bb2d79b201b23eb98022613" + integrity sha512-dyZJdJiCoL+rcfnm0RPkLt/o732HvLiEwmtoNzOoz9MSZz117UH2J6U2vUDtzUzwtFLIf32KkeyzisbwUCgcaQ== dependencies: - "@docusaurus/core" "2.3.1" - "@docusaurus/types" "2.3.1" - "@docusaurus/utils-validation" "2.3.1" + "@docusaurus/core" "2.4.1" + "@docusaurus/types" "2.4.1" + "@docusaurus/utils-validation" "2.4.1" tslib "^2.4.0" -"@docusaurus/plugin-google-gtag@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.3.1.tgz#b8da54a60c0a50aca609c3643faef78cb4f247a0" - integrity sha512-uXtDhfu4+Hm+oqWUySr3DNI5cWC/rmP6XJyAk83Heor3dFjZqDwCbkX8yWPywkRiWev3Dk/rVF8lEn0vIGVocA== +"@docusaurus/plugin-google-gtag@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-gtag/-/plugin-google-gtag-2.4.1.tgz#6a3eb91022714735e625c7ca70ef5188fa7bd0dc" + integrity sha512-mKIefK+2kGTQBYvloNEKtDmnRD7bxHLsBcxgnbt4oZwzi2nxCGjPX6+9SQO2KCN5HZbNrYmGo5GJfMgoRvy6uA== dependencies: - "@docusaurus/core" "2.3.1" - "@docusaurus/types" "2.3.1" - "@docusaurus/utils-validation" "2.3.1" + "@docusaurus/core" "2.4.1" + "@docusaurus/types" "2.4.1" + "@docusaurus/utils-validation" "2.4.1" tslib "^2.4.0" -"@docusaurus/plugin-google-tag-manager@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-2.3.1.tgz#f19bc01cc784fa4734187c5bc637f0574857e15d" - integrity sha512-Ww2BPEYSqg8q8tJdLYPFFM3FMDBCVhEM4UUqKzJaiRMx3NEoly3qqDRAoRDGdIhlC//Rf0iJV9cWAoq2m6k3sw== +"@docusaurus/plugin-google-tag-manager@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-google-tag-manager/-/plugin-google-tag-manager-2.4.1.tgz#b99f71aec00b112bbf509ef2416e404a95eb607e" + integrity sha512-Zg4Ii9CMOLfpeV2nG74lVTWNtisFaH9QNtEw48R5QE1KIwDBdTVaiSA18G1EujZjrzJJzXN79VhINSbOJO/r3g== dependencies: - "@docusaurus/core" "2.3.1" - "@docusaurus/types" "2.3.1" - "@docusaurus/utils-validation" "2.3.1" + "@docusaurus/core" "2.4.1" + "@docusaurus/types" "2.4.1" + "@docusaurus/utils-validation" "2.4.1" tslib "^2.4.0" -"@docusaurus/plugin-ideal-image@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-ideal-image/-/plugin-ideal-image-2.3.1.tgz#002ad1958f7fa2ffa0bd185e9947359a8e1af9cd" - integrity sha512-hN/TbpG8Hsct06RNRZz69iCpxsXzryq+5o/8r62sGwhTAmMCN8ms8an+ubRk4bub0y3Gvg7YUcwmmFf6kE2fJg== +"@docusaurus/plugin-ideal-image@^2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-ideal-image/-/plugin-ideal-image-2.4.1.tgz#110e9814ad3af66235c849d2e00c9e84f552c961" + integrity sha512-jxvgCGPmHxdae2Y2uskzxIbMCA4WLTfzkufsLbD4mEAjCRIkt6yzux6q5kqKTrO+AxzpANVcJNGmaBtKZGv5aw== dependencies: - "@docusaurus/core" "2.3.1" - "@docusaurus/lqip-loader" "2.3.1" + "@docusaurus/core" "2.4.1" + "@docusaurus/lqip-loader" "2.4.1" "@docusaurus/responsive-loader" "^1.7.0" - "@docusaurus/theme-translations" "2.3.1" - "@docusaurus/types" "2.3.1" - "@docusaurus/utils-validation" "2.3.1" + "@docusaurus/theme-translations" "2.4.1" + "@docusaurus/types" "2.4.1" + "@docusaurus/utils-validation" "2.4.1" "@endiliey/react-ideal-image" "^0.0.11" react-waypoint "^10.3.0" sharp "^0.30.7" tslib "^2.4.0" webpack "^5.73.0" -"@docusaurus/plugin-sitemap@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.3.1.tgz#f526ab517ca63b7a3460d585876f5952cb908aa0" - integrity sha512-8Yxile/v6QGYV9vgFiYL+8d2N4z4Er3pSHsrD08c5XI8bUXxTppMwjarDUTH/TRTfgAWotRbhJ6WZLyajLpozA== - dependencies: - "@docusaurus/core" "2.3.1" - "@docusaurus/logger" "2.3.1" - "@docusaurus/types" "2.3.1" - "@docusaurus/utils" "2.3.1" - "@docusaurus/utils-common" "2.3.1" - "@docusaurus/utils-validation" "2.3.1" +"@docusaurus/plugin-sitemap@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/plugin-sitemap/-/plugin-sitemap-2.4.1.tgz#8a7a76ed69dc3e6b4474b6abb10bb03336a9de6d" + integrity sha512-lZx+ijt/+atQ3FVE8FOHV/+X3kuok688OydDXrqKRJyXBJZKgGjA2Qa8RjQ4f27V2woaXhtnyrdPop/+OjVMRg== + dependencies: + "@docusaurus/core" "2.4.1" + "@docusaurus/logger" "2.4.1" + "@docusaurus/types" "2.4.1" + "@docusaurus/utils" "2.4.1" + "@docusaurus/utils-common" "2.4.1" + "@docusaurus/utils-validation" "2.4.1" fs-extra "^10.1.0" sitemap "^7.1.1" tslib "^2.4.0" -"@docusaurus/preset-classic@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-2.3.1.tgz#f0193f06093eb55cafef66bd1ad9e0d33198bf95" - integrity sha512-OQ5W0AHyfdUk0IldwJ3BlnZ1EqoJuu2L2BMhqLbqwNWdkmzmSUvlFLH1Pe7CZSQgB2YUUC/DnmjbPKk/qQD0lQ== - dependencies: - "@docusaurus/core" "2.3.1" - "@docusaurus/plugin-content-blog" "2.3.1" - "@docusaurus/plugin-content-docs" "2.3.1" - "@docusaurus/plugin-content-pages" "2.3.1" - "@docusaurus/plugin-debug" "2.3.1" - "@docusaurus/plugin-google-analytics" "2.3.1" - "@docusaurus/plugin-google-gtag" "2.3.1" - "@docusaurus/plugin-google-tag-manager" "2.3.1" - "@docusaurus/plugin-sitemap" "2.3.1" - "@docusaurus/theme-classic" "2.3.1" - "@docusaurus/theme-common" "2.3.1" - "@docusaurus/theme-search-algolia" "2.3.1" - "@docusaurus/types" "2.3.1" +"@docusaurus/preset-classic@^2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/preset-classic/-/preset-classic-2.4.1.tgz#072f22d0332588e9c5f512d4bded8d7c99f91497" + integrity sha512-P4//+I4zDqQJ+UDgoFrjIFaQ1MeS9UD1cvxVQaI6O7iBmiHQm0MGROP1TbE7HlxlDPXFJjZUK3x3cAoK63smGQ== + dependencies: + "@docusaurus/core" "2.4.1" + "@docusaurus/plugin-content-blog" "2.4.1" + "@docusaurus/plugin-content-docs" "2.4.1" + "@docusaurus/plugin-content-pages" "2.4.1" + "@docusaurus/plugin-debug" "2.4.1" + "@docusaurus/plugin-google-analytics" "2.4.1" + "@docusaurus/plugin-google-gtag" "2.4.1" + "@docusaurus/plugin-google-tag-manager" "2.4.1" + "@docusaurus/plugin-sitemap" "2.4.1" + "@docusaurus/theme-classic" "2.4.1" + "@docusaurus/theme-common" "2.4.1" + "@docusaurus/theme-search-algolia" "2.4.1" + "@docusaurus/types" "2.4.1" "@docusaurus/react-loadable@5.5.2", "react-loadable@npm:@docusaurus/react-loadable@5.5.2": version "5.5.2" @@ -1538,27 +1538,27 @@ dependencies: loader-utils "^2.0.0" -"@docusaurus/theme-classic@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-2.3.1.tgz#8e6e194236e702c0d4e8d7b7cbb6886ae456e598" - integrity sha512-SelSIDvyttb7ZYHj8vEUhqykhAqfOPKk+uP0z85jH72IMC58e7O8DIlcAeBv+CWsLbNIl9/Hcg71X0jazuxJug== - dependencies: - "@docusaurus/core" "2.3.1" - "@docusaurus/mdx-loader" "2.3.1" - "@docusaurus/module-type-aliases" "2.3.1" - "@docusaurus/plugin-content-blog" "2.3.1" - "@docusaurus/plugin-content-docs" "2.3.1" - "@docusaurus/plugin-content-pages" "2.3.1" - "@docusaurus/theme-common" "2.3.1" - "@docusaurus/theme-translations" "2.3.1" - "@docusaurus/types" "2.3.1" - "@docusaurus/utils" "2.3.1" - "@docusaurus/utils-common" "2.3.1" - "@docusaurus/utils-validation" "2.3.1" +"@docusaurus/theme-classic@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-classic/-/theme-classic-2.4.1.tgz#0060cb263c1a73a33ac33f79bb6bc2a12a56ad9e" + integrity sha512-Rz0wKUa+LTW1PLXmwnf8mn85EBzaGSt6qamqtmnh9Hflkc+EqiYMhtUJeLdV+wsgYq4aG0ANc+bpUDpsUhdnwg== + dependencies: + "@docusaurus/core" "2.4.1" + "@docusaurus/mdx-loader" "2.4.1" + "@docusaurus/module-type-aliases" "2.4.1" + "@docusaurus/plugin-content-blog" "2.4.1" + "@docusaurus/plugin-content-docs" "2.4.1" + "@docusaurus/plugin-content-pages" "2.4.1" + "@docusaurus/theme-common" "2.4.1" + "@docusaurus/theme-translations" "2.4.1" + "@docusaurus/types" "2.4.1" + "@docusaurus/utils" "2.4.1" + "@docusaurus/utils-common" "2.4.1" + "@docusaurus/utils-validation" "2.4.1" "@mdx-js/react" "^1.6.22" clsx "^1.2.1" copy-text-to-clipboard "^3.0.1" - infima "0.2.0-alpha.42" + infima "0.2.0-alpha.43" lodash "^4.17.21" nprogress "^0.2.0" postcss "^8.4.14" @@ -1569,17 +1569,18 @@ tslib "^2.4.0" utility-types "^3.10.0" -"@docusaurus/theme-common@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-2.3.1.tgz#82f52d80226efef8c4418c4eacfc5051aa215f7f" - integrity sha512-RYmYl2OR2biO+yhmW1aS5FyEvnrItPINa+0U2dMxcHpah8reSCjQ9eJGRmAgkZFchV1+aIQzXOI1K7LCW38O0g== - dependencies: - "@docusaurus/mdx-loader" "2.3.1" - "@docusaurus/module-type-aliases" "2.3.1" - "@docusaurus/plugin-content-blog" "2.3.1" - "@docusaurus/plugin-content-docs" "2.3.1" - "@docusaurus/plugin-content-pages" "2.3.1" - "@docusaurus/utils" "2.3.1" +"@docusaurus/theme-common@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-common/-/theme-common-2.4.1.tgz#03e16f7aa96455e952f3243ac99757b01a3c83d4" + integrity sha512-G7Zau1W5rQTaFFB3x3soQoZpkgMbl/SYNG8PfMFIjKa3M3q8n0m/GRf5/H/e5BqOvt8c+ZWIXGCiz+kUCSHovA== + dependencies: + "@docusaurus/mdx-loader" "2.4.1" + "@docusaurus/module-type-aliases" "2.4.1" + "@docusaurus/plugin-content-blog" "2.4.1" + "@docusaurus/plugin-content-docs" "2.4.1" + "@docusaurus/plugin-content-pages" "2.4.1" + "@docusaurus/utils" "2.4.1" + "@docusaurus/utils-common" "2.4.1" "@types/history" "^4.7.11" "@types/react" "*" "@types/react-router-config" "*" @@ -1590,33 +1591,33 @@ use-sync-external-store "^1.2.0" utility-types "^3.10.0" -"@docusaurus/theme-mermaid@^2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-mermaid/-/theme-mermaid-2.3.1.tgz#cdaff255ac414bd7130139ac471e952049f56f92" - integrity sha512-Hh1I4FSt+5qlrq6dBOgj/klv2Ijmzbn0ysa5XMDHeD6Fa3fK63vvf0KJMR6VzB9VHU8QjMqqAR+n9500/Kq4lw== - dependencies: - "@docusaurus/core" "2.3.1" - "@docusaurus/module-type-aliases" "2.3.1" - "@docusaurus/theme-common" "2.3.1" - "@docusaurus/types" "2.3.1" - "@docusaurus/utils-validation" "2.3.1" +"@docusaurus/theme-mermaid@^2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-mermaid/-/theme-mermaid-2.4.1.tgz#6bf644f9f7ef3db0e938b484f510d6d80d601419" + integrity sha512-cM0ImKIqZfjmlaC+uAjep39kNBvb1bjz429QBHGs32maob4+UnRzVPPpCUCltyPVb4xjG5h1Tyq4pHzhtIikqA== + dependencies: + "@docusaurus/core" "2.4.1" + "@docusaurus/module-type-aliases" "2.4.1" + "@docusaurus/theme-common" "2.4.1" + "@docusaurus/types" "2.4.1" + "@docusaurus/utils-validation" "2.4.1" "@mdx-js/react" "^1.6.22" mermaid "^9.2.2" tslib "^2.4.0" -"@docusaurus/theme-search-algolia@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.3.1.tgz#d587b40913119e9287d14670e277b933d8f453f0" - integrity sha512-JdHaRqRuH1X++g5fEMLnq7OtULSGQdrs9AbhcWRQ428ZB8/HOiaN6mj3hzHvcD3DFgu7koIVtWPQnvnN7iwzHA== +"@docusaurus/theme-search-algolia@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-search-algolia/-/theme-search-algolia-2.4.1.tgz#906bd2cca3fced0241985ef502c892f58ff380fc" + integrity sha512-6BcqW2lnLhZCXuMAvPRezFs1DpmEKzXFKlYjruuas+Xy3AQeFzDJKTJFIm49N77WFCTyxff8d3E4Q9pi/+5McQ== dependencies: "@docsearch/react" "^3.1.1" - "@docusaurus/core" "2.3.1" - "@docusaurus/logger" "2.3.1" - "@docusaurus/plugin-content-docs" "2.3.1" - "@docusaurus/theme-common" "2.3.1" - "@docusaurus/theme-translations" "2.3.1" - "@docusaurus/utils" "2.3.1" - "@docusaurus/utils-validation" "2.3.1" + "@docusaurus/core" "2.4.1" + "@docusaurus/logger" "2.4.1" + "@docusaurus/plugin-content-docs" "2.4.1" + "@docusaurus/theme-common" "2.4.1" + "@docusaurus/theme-translations" "2.4.1" + "@docusaurus/utils" "2.4.1" + "@docusaurus/utils-validation" "2.4.1" algoliasearch "^4.13.1" algoliasearch-helper "^3.10.0" clsx "^1.2.1" @@ -1626,18 +1627,18 @@ tslib "^2.4.0" utility-types "^3.10.0" -"@docusaurus/theme-translations@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-2.3.1.tgz#b2b1ecc00a737881b5bfabc19f90b20f0fe02bb3" - integrity sha512-BsBZzAewJabVhoGG1Ij2u4pMS3MPW6gZ6sS4pc+Y7czevRpzxoFNJXRtQDVGe7mOpv/MmRmqg4owDK+lcOTCVQ== +"@docusaurus/theme-translations@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/theme-translations/-/theme-translations-2.4.1.tgz#4d49df5865dae9ef4b98a19284ede62ae6f98726" + integrity sha512-T1RAGP+f86CA1kfE8ejZ3T3pUU3XcyvrGMfC/zxCtc2BsnoexuNI9Vk2CmuKCb+Tacvhxjv5unhxXce0+NKyvA== dependencies: fs-extra "^10.1.0" tslib "^2.4.0" -"@docusaurus/types@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-2.3.1.tgz#785ade2e0f4e35e1eb7fb0d04c27d11c3991a2e8" - integrity sha512-PREbIRhTaNNY042qmfSE372Jb7djZt+oVTZkoqHJ8eff8vOIc2zqqDqBVc5BhOfpZGPTrE078yy/torUEZy08A== +"@docusaurus/types@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/types/-/types-2.4.1.tgz#d8e82f9e0f704984f98df1f93d6b4554d5458705" + integrity sha512-0R+cbhpMkhbRXX138UOc/2XZFF8hiZa6ooZAEEJFp5scytzCw4tC1gChMFXrpa3d2tYE6AX8IrOEpSonLmfQuQ== dependencies: "@types/history" "^4.7.11" "@types/react" "*" @@ -1648,30 +1649,30 @@ webpack "^5.73.0" webpack-merge "^5.8.0" -"@docusaurus/utils-common@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.3.1.tgz#1abe66846eb641547e4964d44f3011938e58e50b" - integrity sha512-pVlRpXkdNcxmKNxAaB1ya2hfCEvVsLDp2joeM6K6uv55Oc5nVIqgyYSgSNKZyMdw66NnvMfsu0RBylcwZQKo9A== +"@docusaurus/utils-common@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/utils-common/-/utils-common-2.4.1.tgz#7f72e873e49bd5179588869cc3ab7449a56aae63" + integrity sha512-bCVGdZU+z/qVcIiEQdyx0K13OC5mYwxhSuDUR95oFbKVuXYRrTVrwZIqQljuo1fyJvFTKHiL9L9skQOPokuFNQ== dependencies: tslib "^2.4.0" -"@docusaurus/utils-validation@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.3.1.tgz#b65c718ba9b84b7a891bccf5ac6d19b57ee7d887" - integrity sha512-7n0208IG3k1HVTByMHlZoIDjjOFC8sbViHVXJx0r3Q+3Ezrx+VQ1RZ/zjNn6lT+QBCRCXlnlaoJ8ug4HIVgQ3w== +"@docusaurus/utils-validation@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/utils-validation/-/utils-validation-2.4.1.tgz#19959856d4a886af0c5cfb357f4ef68b51151244" + integrity sha512-unII3hlJlDwZ3w8U+pMO3Lx3RhI4YEbY3YNsQj4yzrkZzlpqZOLuAiZK2JyULnD+TKbceKU0WyWkQXtYbLNDFA== dependencies: - "@docusaurus/logger" "2.3.1" - "@docusaurus/utils" "2.3.1" + "@docusaurus/logger" "2.4.1" + "@docusaurus/utils" "2.4.1" joi "^17.6.0" js-yaml "^4.1.0" tslib "^2.4.0" -"@docusaurus/utils@2.3.1": - version "2.3.1" - resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.3.1.tgz#24b9cae3a23b1e6dc88f95c45722c7e82727b032" - integrity sha512-9WcQROCV0MmrpOQDXDGhtGMd52DHpSFbKLfkyaYumzbTstrbA5pPOtiGtxK1nqUHkiIv8UwexS54p0Vod2I1lg== +"@docusaurus/utils@2.4.1": + version "2.4.1" + resolved "https://registry.yarnpkg.com/@docusaurus/utils/-/utils-2.4.1.tgz#9c5f76eae37b71f3819c1c1f0e26e6807c99a4fc" + integrity sha512-1lvEZdAQhKNht9aPXPoh69eeKnV0/62ROhQeFKKxmzd0zkcuE/Oc5Gpnt00y/f5bIsmOsYMY7Pqfm/5rteT5GA== dependencies: - "@docusaurus/logger" "2.3.1" + "@docusaurus/logger" "2.4.1" "@svgr/webpack" "^6.2.1" escape-string-regexp "^4.0.0" file-loader "^6.2.0" @@ -5036,10 +5037,10 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== -infima@0.2.0-alpha.42: - version "0.2.0-alpha.42" - resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.42.tgz#f6e86a655ad40877c6b4d11b2ede681eb5470aa5" - integrity sha512-ift8OXNbQQwtbIt6z16KnSWP7uJ/SysSMFI4F87MNRTicypfl4Pv3E2OGVv6N3nSZFJvA8imYulCBS64iyHYww== +infima@0.2.0-alpha.43: + version "0.2.0-alpha.43" + resolved "https://registry.yarnpkg.com/infima/-/infima-0.2.0-alpha.43.tgz#f7aa1d7b30b6c08afef441c726bac6150228cbe0" + integrity sha512-2uw57LvUqW0rK/SWYnd/2rRfxNA5DDNOh33jxF7fy46VWoNhGxiUQyVZHbBMjQ33mQem0cjdDVwgWVAmlRfgyQ== inflight@^1.0.4: version "1.0.6" From baf336a9c7a621eecf1a92c9234bf0da629bdef7 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Sun, 3 Sep 2023 15:56:36 +0000 Subject: [PATCH 2/6] exp: use build system --- .circleci/config.yml | 439 +++++++++++++++++++----------------- build_manifest.json | 7 + docs/.dockerignore | 15 +- docs/{ => scripts}/build.sh | 0 4 files changed, 240 insertions(+), 221 deletions(-) rename docs/{ => scripts}/build.sh (100%) diff --git a/.circleci/config.yml b/.circleci/config.yml index fd2394940346..0b6666bbdff8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -972,6 +972,18 @@ jobs: name: "Test" command: cond_spot_run_test_script ./scripts/run_tests canary-build uniswap_trade_on_l1_from_l2.test.ts canary-build docker-compose-e2e-sandbox.yml + build-docs: + docker: + - image: aztecprotocol/alpine-build-image + resource_class: small + steps: + - *checkout + - *setup_env + - run: + name: "Build docs" + working_directory: docs + command: cond_spot_run_test_script ./scripts/build.sh docs + e2e-join: docker: - image: cimg/base:current @@ -1232,218 +1244,219 @@ workflows: when: equal: [system, << pipeline.parameters.workflow >>] jobs: - - barretenberg-x86_64-linux-gcc: *defaults - - barretenberg-x86_64-linux-clang: *defaults - - barretenberg-x86_64-linux-clang-assert: *defaults - - barretenberg-x86_64-linux-clang-fuzzing: *defaults - - barretenberg-wasm-linux-clang: *defaults - - barretenberg-proof-system-tests: *bb_test - - barretenberg-honk-tests: *bb_test - - barretenberg-dsl-tests: *bb_test - - barretenberg-tests: *bb_test - - barretenberg-stdlib-tests: *bb_test - - barretenberg-stdlib-recursion-turbo-tests: *bb_test - - barretenberg-stdlib-recursion-ultra-tests: *bb_test - - barretenberg-join-split-tests: *bb_test - - barretenberg-benchmark-aggregator: - requires: - - barretenberg-tests - - barretenberg-stdlib-tests - - barretenberg-stdlib-recursion-turbo-tests - - barretenberg-stdlib-recursion-ultra-tests - - barretenberg-join-split-tests - filters: - branches: - only: - - master - <<: *defaults - - bb-js: - requires: - - barretenberg-wasm-linux-clang - <<: *defaults - - bb-js-tests: - requires: - - bb-js - <<: *defaults - - barretenberg-acir-tests: - requires: - - barretenberg-x86_64-linux-clang-assert - - bb-js - <<: *defaults - - circuits-wasm-linux-clang: *defaults - - circuits-wasm-linux-clang-assert: *defaults - - circuits-x86_64-linux-clang-tidy: *defaults - - circuits-x86_64-linux-clang: *defaults - - circuits-x86_64-linux-clang-assert: *defaults - - circuits-wasm-tests: - <<: *circuits-wasm-test - - circuits-x86_64-tests: - <<: *circuits-x86_64-test - - - circuits-end: - requires: - - circuits-wasm-linux-clang - - circuits-wasm-linux-clang-assert - - circuits-x86_64-linux-clang-tidy - - circuits-x86_64-linux-clang - - circuits-x86_64-linux-clang-assert - - circuits-wasm-tests - - circuits-x86_64-tests - <<: *defaults - - - l1-contracts: *defaults - - noir-contracts-build: *defaults - - - yarn-project-base: - requires: - - circuits-wasm-linux-clang - - l1-contracts - - noir-contracts-build - <<: *defaults - - - aztec-js: *yarn_project - - end-to-end: *yarn_project - - ethereum: *yarn_project - - foundation: *yarn_project - - world-state: *yarn_project - - acir-simulator: *yarn_project - - archiver: *yarn_project - - aztec-rpc: *yarn_project - - aztec-node: *yarn_project - - aztec-cli: *yarn_project - - key-store: *yarn_project - - merkle-tree: *yarn_project - - p2p: *yarn_project - - p2p-bootstrap: *yarn_project - - l1-artifacts: *yarn_project - - noir-compiler: *yarn_project - - noir-contracts: *yarn_project - - sequencer-client: *yarn_project - - types: *yarn_project - - circuits-js: *yarn_project - - rollup-provider: *yarn_project - - aztec-sandbox: *yarn_project - - canary: *yarn_project - - - e2e-join: - requires: - - aztec-js - - end-to-end - - ethereum - - foundation - - world-state - - acir-simulator - - archiver - - aztec-rpc - - aztec-node - - aztec-cli - - key-store - - merkle-tree - - p2p - - p2p-bootstrap - - l1-artifacts - - noir-compiler - - noir-contracts - - sequencer-client - - types - - circuits-js - - rollup-provider - - aztec-sandbox - - canary - <<: *defaults - - - e2e-2-rpc-servers: *e2e_test - - e2e-deploy-contract: *e2e_test - - e2e-lending-contract: *e2e_test - - e2e-private-token-contract: *e2e_test - - e2e-sandbox-example: *e2e_test - - e2e-multi-transfer-contract: *e2e_test - - e2e-block-building: *e2e_test - - e2e-nested-contract: *e2e_test - - e2e-non-contract-account: *e2e_test - - e2e-multiple-accounts-1-enc-key: *e2e_test - - e2e-public-token-contract: *e2e_test - - e2e-cli: *e2e_test - - e2e-cross-chain-messaging: *e2e_test - - e2e-public-cross-chain-messaging: *e2e_test - - e2e-public-to-private-messaging: *e2e_test - - e2e-account-contracts: *e2e_test - - e2e-escrow-contract: *e2e_test - - e2e-pending-commitments-contract: *e2e_test - - e2e-ordering: *e2e_test - - uniswap-trade-on-l1-from-l2: *e2e_test - - integration-l1-publisher: *e2e_test - - integration-archiver-l1-to-l2: *e2e_test - - e2e-p2p: *e2e_test - - e2e-canary-test: *e2e_test - - e2e-browser-sandbox: *e2e_test - - aztec-rpc-sandbox: *e2e_test - - guides-writing-an-account-contract: *e2e_test - - - e2e-end: - requires: - - e2e-2-rpc-servers - - e2e-deploy-contract - - e2e-lending-contract - - e2e-private-token-contract - - e2e-sandbox-example - - e2e-multi-transfer-contract - - e2e-block-building - - e2e-nested-contract - - e2e-non-contract-account - - e2e-multiple-accounts-1-enc-key - - e2e-public-token-contract - - e2e-cli - - e2e-cross-chain-messaging - - e2e-public-cross-chain-messaging - - e2e-public-to-private-messaging - - e2e-account-contracts - - e2e-escrow-contract - - e2e-pending-commitments-contract - - e2e-ordering - - uniswap-trade-on-l1-from-l2 - - integration-l1-publisher - - integration-archiver-l1-to-l2 - - e2e-p2p - - e2e-browser-sandbox - - e2e-canary-test - - aztec-rpc-sandbox - - guides-writing-an-account-contract - <<: *defaults - - - deploy-dockerhub: - requires: - - e2e-end - <<: *deploy_defaults - - deploy-npm: - requires: - - e2e-end - <<: *deploy_defaults - - - deploy-end: - requires: - - deploy-dockerhub - - deploy-npm - <<: *deploy_defaults - - - build-deployment-canary: - requires: - - deploy-end - <<: *deploy_defaults - - - run-deployment-canary-uniswap: - requires: - - build-deployment-canary - <<: *deploy_defaults - - - run-deployment-canary-browser: - requires: - - build-deployment-canary - <<: *deploy_defaults - - - run-deployment-canary-cli: - requires: - - build-deployment-canary - <<: *deploy_defaults + - build-docs: *defaults + # - barretenberg-x86_64-linux-gcc: *defaults + # - barretenberg-x86_64-linux-clang: *defaults + # - barretenberg-x86_64-linux-clang-assert: *defaults + # - barretenberg-x86_64-linux-clang-fuzzing: *defaults + # - barretenberg-wasm-linux-clang: *defaults + # - barretenberg-proof-system-tests: *bb_test + # - barretenberg-honk-tests: *bb_test + # - barretenberg-dsl-tests: *bb_test + # - barretenberg-tests: *bb_test + # - barretenberg-stdlib-tests: *bb_test + # - barretenberg-stdlib-recursion-turbo-tests: *bb_test + # - barretenberg-stdlib-recursion-ultra-tests: *bb_test + # - barretenberg-join-split-tests: *bb_test + # - barretenberg-benchmark-aggregator: + # requires: + # - barretenberg-tests + # - barretenberg-stdlib-tests + # - barretenberg-stdlib-recursion-turbo-tests + # - barretenberg-stdlib-recursion-ultra-tests + # - barretenberg-join-split-tests + # filters: + # branches: + # only: + # - master + # <<: *defaults + # - bb-js: + # requires: + # - barretenberg-wasm-linux-clang + # <<: *defaults + # - bb-js-tests: + # requires: + # - bb-js + # <<: *defaults + # - barretenberg-acir-tests: + # requires: + # - barretenberg-x86_64-linux-clang-assert + # - bb-js + # <<: *defaults + # - circuits-wasm-linux-clang: *defaults + # - circuits-wasm-linux-clang-assert: *defaults + # - circuits-x86_64-linux-clang-tidy: *defaults + # - circuits-x86_64-linux-clang: *defaults + # - circuits-x86_64-linux-clang-assert: *defaults + # - circuits-wasm-tests: + # <<: *circuits-wasm-test + # - circuits-x86_64-tests: + # <<: *circuits-x86_64-test + + # - circuits-end: + # requires: + # - circuits-wasm-linux-clang + # - circuits-wasm-linux-clang-assert + # - circuits-x86_64-linux-clang-tidy + # - circuits-x86_64-linux-clang + # - circuits-x86_64-linux-clang-assert + # - circuits-wasm-tests + # - circuits-x86_64-tests + # <<: *defaults + + # - l1-contracts: *defaults + # - noir-contracts-build: *defaults + + # - yarn-project-base: + # requires: + # - circuits-wasm-linux-clang + # - l1-contracts + # - noir-contracts-build + # <<: *defaults + + # - aztec-js: *yarn_project + # - end-to-end: *yarn_project + # - ethereum: *yarn_project + # - foundation: *yarn_project + # - world-state: *yarn_project + # - acir-simulator: *yarn_project + # - archiver: *yarn_project + # - aztec-rpc: *yarn_project + # - aztec-node: *yarn_project + # - aztec-cli: *yarn_project + # - key-store: *yarn_project + # - merkle-tree: *yarn_project + # - p2p: *yarn_project + # - p2p-bootstrap: *yarn_project + # - l1-artifacts: *yarn_project + # - noir-compiler: *yarn_project + # - noir-contracts: *yarn_project + # - sequencer-client: *yarn_project + # - types: *yarn_project + # - circuits-js: *yarn_project + # - rollup-provider: *yarn_project + # - aztec-sandbox: *yarn_project + # - canary: *yarn_project + + # - e2e-join: + # requires: + # - aztec-js + # - end-to-end + # - ethereum + # - foundation + # - world-state + # - acir-simulator + # - archiver + # - aztec-rpc + # - aztec-node + # - aztec-cli + # - key-store + # - merkle-tree + # - p2p + # - p2p-bootstrap + # - l1-artifacts + # - noir-compiler + # - noir-contracts + # - sequencer-client + # - types + # - circuits-js + # - rollup-provider + # - aztec-sandbox + # - canary + # <<: *defaults + + # - e2e-2-rpc-servers: *e2e_test + # - e2e-deploy-contract: *e2e_test + # - e2e-lending-contract: *e2e_test + # - e2e-private-token-contract: *e2e_test + # - e2e-sandbox-example: *e2e_test + # - e2e-multi-transfer-contract: *e2e_test + # - e2e-block-building: *e2e_test + # - e2e-nested-contract: *e2e_test + # - e2e-non-contract-account: *e2e_test + # - e2e-multiple-accounts-1-enc-key: *e2e_test + # - e2e-public-token-contract: *e2e_test + # - e2e-cli: *e2e_test + # - e2e-cross-chain-messaging: *e2e_test + # - e2e-public-cross-chain-messaging: *e2e_test + # - e2e-public-to-private-messaging: *e2e_test + # - e2e-account-contracts: *e2e_test + # - e2e-escrow-contract: *e2e_test + # - e2e-pending-commitments-contract: *e2e_test + # - e2e-ordering: *e2e_test + # - uniswap-trade-on-l1-from-l2: *e2e_test + # - integration-l1-publisher: *e2e_test + # - integration-archiver-l1-to-l2: *e2e_test + # - e2e-p2p: *e2e_test + # - e2e-canary-test: *e2e_test + # - e2e-browser-sandbox: *e2e_test + # - aztec-rpc-sandbox: *e2e_test + # - guides-writing-an-account-contract: *e2e_test + + # - e2e-end: + # requires: + # - e2e-2-rpc-servers + # - e2e-deploy-contract + # - e2e-lending-contract + # - e2e-private-token-contract + # - e2e-sandbox-example + # - e2e-multi-transfer-contract + # - e2e-block-building + # - e2e-nested-contract + # - e2e-non-contract-account + # - e2e-multiple-accounts-1-enc-key + # - e2e-public-token-contract + # - e2e-cli + # - e2e-cross-chain-messaging + # - e2e-public-cross-chain-messaging + # - e2e-public-to-private-messaging + # - e2e-account-contracts + # - e2e-escrow-contract + # - e2e-pending-commitments-contract + # - e2e-ordering + # - uniswap-trade-on-l1-from-l2 + # - integration-l1-publisher + # - integration-archiver-l1-to-l2 + # - e2e-p2p + # - e2e-browser-sandbox + # - e2e-canary-test + # - aztec-rpc-sandbox + # - guides-writing-an-account-contract + # <<: *defaults + + # - deploy-dockerhub: + # requires: + # - e2e-end + # <<: *deploy_defaults + # - deploy-npm: + # requires: + # - e2e-end + # <<: *deploy_defaults + + # - deploy-end: + # requires: + # - deploy-dockerhub + # - deploy-npm + # <<: *deploy_defaults + + # - build-deployment-canary: + # requires: + # - deploy-end + # <<: *deploy_defaults + + # - run-deployment-canary-uniswap: + # requires: + # - build-deployment-canary + # <<: *deploy_defaults + + # - run-deployment-canary-browser: + # requires: + # - build-deployment-canary + # <<: *deploy_defaults + + # - run-deployment-canary-cli: + # requires: + # - build-deployment-canary + # <<: *deploy_defaults diff --git a/build_manifest.json b/build_manifest.json index 7ae4ef62ae6f..8bd107967e1c 100644 --- a/build_manifest.json +++ b/build_manifest.json @@ -122,6 +122,13 @@ ], "dependencies": [] }, + "docs": { + "buildDir": "docs", + "rebuildPatterns": [ + "^docs/" + ], + "dependencies": [] + }, "l1-contracts": { "buildDir": "l1-contracts", "dockerfile": "Dockerfile", diff --git a/docs/.dockerignore b/docs/.dockerignore index 8e534366f15e..b2ce352e7c25 100644 --- a/docs/.dockerignore +++ b/docs/.dockerignore @@ -5,9 +5,6 @@ *Dockerfile *.CONTRIBUTING.md *.LICENSE -*/build/ -*/build-wasm/ -*/build-coverage/ # Ignore C++ object files and executables *.o @@ -15,11 +12,13 @@ *.exe *.so *.a -*/build/ -*/Debug/ -*/Release/ - -/barretenberg/ +build/ +Debug/ +Release/ +circuits/cpp/build/ +circuits/cpp/build-wasm/ +circuits/cpp/build-coverage/ +circuits/cpp/barretenberg/ # Ignore Node.js build artifacts */node_modules/ diff --git a/docs/build.sh b/docs/scripts/build.sh similarity index 100% rename from docs/build.sh rename to docs/scripts/build.sh From 95f3e62a45c4de897536e5571b8f86b941fce3ca Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Sun, 3 Sep 2023 16:08:29 +0000 Subject: [PATCH 3/6] exp: alternate arrangement --- .circleci/config.yml | 15 ++++++++++----- build_manifest.json | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0b6666bbdff8..7361e7f58bf1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -973,16 +973,21 @@ jobs: command: cond_spot_run_test_script ./scripts/run_tests canary-build uniswap_trade_on_l1_from_l2.test.ts canary-build docker-compose-e2e-sandbox.yml build-docs: - docker: - - image: aztecprotocol/alpine-build-image - resource_class: small + machine: + image: ubuntu-2004:202010-01 + resource_class: large steps: - *checkout - *setup_env + - run: + name: "Copy docs dockerignore" + command: cp docs/.dockerignore . - run: name: "Build docs" - working_directory: docs - command: cond_spot_run_test_script ./scripts/build.sh docs + command: build docs + - run: + name: "Remove dockerignore" + command: rm .dockerignore e2e-join: docker: diff --git a/build_manifest.json b/build_manifest.json index 8bd107967e1c..d89a7b0d6699 100644 --- a/build_manifest.json +++ b/build_manifest.json @@ -123,7 +123,8 @@ "dependencies": [] }, "docs": { - "buildDir": "docs", + "buildDir": ".", + "dockerfile": "docs/Dockerfile", "rebuildPatterns": [ "^docs/" ], From 64f022e574ef7faab8926596f0c835a9fcc46321 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Sun, 3 Sep 2023 16:17:16 +0000 Subject: [PATCH 4/6] fix: always rebuild --- .circleci/config.yml | 3 --- build_manifest.json | 2 +- docs/scripts/build.sh | 9 --------- 3 files changed, 1 insertion(+), 13 deletions(-) delete mode 100755 docs/scripts/build.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 7361e7f58bf1..70639d2ee6f9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -985,9 +985,6 @@ jobs: - run: name: "Build docs" command: build docs - - run: - name: "Remove dockerignore" - command: rm .dockerignore e2e-join: docker: diff --git a/build_manifest.json b/build_manifest.json index d89a7b0d6699..1f862827391b 100644 --- a/build_manifest.json +++ b/build_manifest.json @@ -126,7 +126,7 @@ "buildDir": ".", "dockerfile": "docs/Dockerfile", "rebuildPatterns": [ - "^docs/" + "^." ], "dependencies": [] }, diff --git a/docs/scripts/build.sh b/docs/scripts/build.sh deleted file mode 100755 index b1d692211fa2..000000000000 --- a/docs/scripts/build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# Temporarily copy the docker ignore into the core context -cp .dockerignore .. - -# Build in the root context -(cd .. && docker build . -f docs/Dockerfile) - -rm ../.dockerignore \ No newline at end of file From a98555e933ada58d7435552a5ba57d3b21f17cbe Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Sun, 3 Sep 2023 16:25:28 +0000 Subject: [PATCH 5/6] fix: reenable ci --- .circleci/config.yml | 427 +++++++++++++++++++++---------------------- 1 file changed, 213 insertions(+), 214 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 70639d2ee6f9..16cea2556ab1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1247,218 +1247,217 @@ workflows: equal: [system, << pipeline.parameters.workflow >>] jobs: - build-docs: *defaults - # - barretenberg-x86_64-linux-gcc: *defaults - # - barretenberg-x86_64-linux-clang: *defaults - # - barretenberg-x86_64-linux-clang-assert: *defaults - # - barretenberg-x86_64-linux-clang-fuzzing: *defaults - # - barretenberg-wasm-linux-clang: *defaults - # - barretenberg-proof-system-tests: *bb_test - # - barretenberg-honk-tests: *bb_test - # - barretenberg-dsl-tests: *bb_test - # - barretenberg-tests: *bb_test - # - barretenberg-stdlib-tests: *bb_test - # - barretenberg-stdlib-recursion-turbo-tests: *bb_test - # - barretenberg-stdlib-recursion-ultra-tests: *bb_test - # - barretenberg-join-split-tests: *bb_test - # - barretenberg-benchmark-aggregator: - # requires: - # - barretenberg-tests - # - barretenberg-stdlib-tests - # - barretenberg-stdlib-recursion-turbo-tests - # - barretenberg-stdlib-recursion-ultra-tests - # - barretenberg-join-split-tests - # filters: - # branches: - # only: - # - master - # <<: *defaults - # - bb-js: - # requires: - # - barretenberg-wasm-linux-clang - # <<: *defaults - # - bb-js-tests: - # requires: - # - bb-js - # <<: *defaults - # - barretenberg-acir-tests: - # requires: - # - barretenberg-x86_64-linux-clang-assert - # - bb-js - # <<: *defaults - # - circuits-wasm-linux-clang: *defaults - # - circuits-wasm-linux-clang-assert: *defaults - # - circuits-x86_64-linux-clang-tidy: *defaults - # - circuits-x86_64-linux-clang: *defaults - # - circuits-x86_64-linux-clang-assert: *defaults - # - circuits-wasm-tests: - # <<: *circuits-wasm-test - # - circuits-x86_64-tests: - # <<: *circuits-x86_64-test - - # - circuits-end: - # requires: - # - circuits-wasm-linux-clang - # - circuits-wasm-linux-clang-assert - # - circuits-x86_64-linux-clang-tidy - # - circuits-x86_64-linux-clang - # - circuits-x86_64-linux-clang-assert - # - circuits-wasm-tests - # - circuits-x86_64-tests - # <<: *defaults - - # - l1-contracts: *defaults - # - noir-contracts-build: *defaults - - # - yarn-project-base: - # requires: - # - circuits-wasm-linux-clang - # - l1-contracts - # - noir-contracts-build - # <<: *defaults - - # - aztec-js: *yarn_project - # - end-to-end: *yarn_project - # - ethereum: *yarn_project - # - foundation: *yarn_project - # - world-state: *yarn_project - # - acir-simulator: *yarn_project - # - archiver: *yarn_project - # - aztec-rpc: *yarn_project - # - aztec-node: *yarn_project - # - aztec-cli: *yarn_project - # - key-store: *yarn_project - # - merkle-tree: *yarn_project - # - p2p: *yarn_project - # - p2p-bootstrap: *yarn_project - # - l1-artifacts: *yarn_project - # - noir-compiler: *yarn_project - # - noir-contracts: *yarn_project - # - sequencer-client: *yarn_project - # - types: *yarn_project - # - circuits-js: *yarn_project - # - rollup-provider: *yarn_project - # - aztec-sandbox: *yarn_project - # - canary: *yarn_project - - # - e2e-join: - # requires: - # - aztec-js - # - end-to-end - # - ethereum - # - foundation - # - world-state - # - acir-simulator - # - archiver - # - aztec-rpc - # - aztec-node - # - aztec-cli - # - key-store - # - merkle-tree - # - p2p - # - p2p-bootstrap - # - l1-artifacts - # - noir-compiler - # - noir-contracts - # - sequencer-client - # - types - # - circuits-js - # - rollup-provider - # - aztec-sandbox - # - canary - # <<: *defaults - - # - e2e-2-rpc-servers: *e2e_test - # - e2e-deploy-contract: *e2e_test - # - e2e-lending-contract: *e2e_test - # - e2e-private-token-contract: *e2e_test - # - e2e-sandbox-example: *e2e_test - # - e2e-multi-transfer-contract: *e2e_test - # - e2e-block-building: *e2e_test - # - e2e-nested-contract: *e2e_test - # - e2e-non-contract-account: *e2e_test - # - e2e-multiple-accounts-1-enc-key: *e2e_test - # - e2e-public-token-contract: *e2e_test - # - e2e-cli: *e2e_test - # - e2e-cross-chain-messaging: *e2e_test - # - e2e-public-cross-chain-messaging: *e2e_test - # - e2e-public-to-private-messaging: *e2e_test - # - e2e-account-contracts: *e2e_test - # - e2e-escrow-contract: *e2e_test - # - e2e-pending-commitments-contract: *e2e_test - # - e2e-ordering: *e2e_test - # - uniswap-trade-on-l1-from-l2: *e2e_test - # - integration-l1-publisher: *e2e_test - # - integration-archiver-l1-to-l2: *e2e_test - # - e2e-p2p: *e2e_test - # - e2e-canary-test: *e2e_test - # - e2e-browser-sandbox: *e2e_test - # - aztec-rpc-sandbox: *e2e_test - # - guides-writing-an-account-contract: *e2e_test - - # - e2e-end: - # requires: - # - e2e-2-rpc-servers - # - e2e-deploy-contract - # - e2e-lending-contract - # - e2e-private-token-contract - # - e2e-sandbox-example - # - e2e-multi-transfer-contract - # - e2e-block-building - # - e2e-nested-contract - # - e2e-non-contract-account - # - e2e-multiple-accounts-1-enc-key - # - e2e-public-token-contract - # - e2e-cli - # - e2e-cross-chain-messaging - # - e2e-public-cross-chain-messaging - # - e2e-public-to-private-messaging - # - e2e-account-contracts - # - e2e-escrow-contract - # - e2e-pending-commitments-contract - # - e2e-ordering - # - uniswap-trade-on-l1-from-l2 - # - integration-l1-publisher - # - integration-archiver-l1-to-l2 - # - e2e-p2p - # - e2e-browser-sandbox - # - e2e-canary-test - # - aztec-rpc-sandbox - # - guides-writing-an-account-contract - # <<: *defaults - - # - deploy-dockerhub: - # requires: - # - e2e-end - # <<: *deploy_defaults - # - deploy-npm: - # requires: - # - e2e-end - # <<: *deploy_defaults - - # - deploy-end: - # requires: - # - deploy-dockerhub - # - deploy-npm - # <<: *deploy_defaults - - # - build-deployment-canary: - # requires: - # - deploy-end - # <<: *deploy_defaults - - # - run-deployment-canary-uniswap: - # requires: - # - build-deployment-canary - # <<: *deploy_defaults - - # - run-deployment-canary-browser: - # requires: - # - build-deployment-canary - # <<: *deploy_defaults - - # - run-deployment-canary-cli: - # requires: - # - build-deployment-canary - # <<: *deploy_defaults - + - barretenberg-x86_64-linux-gcc: *defaults + - barretenberg-x86_64-linux-clang: *defaults + - barretenberg-x86_64-linux-clang-assert: *defaults + - barretenberg-x86_64-linux-clang-fuzzing: *defaults + - barretenberg-wasm-linux-clang: *defaults + - barretenberg-proof-system-tests: *bb_test + - barretenberg-honk-tests: *bb_test + - barretenberg-dsl-tests: *bb_test + - barretenberg-tests: *bb_test + - barretenberg-stdlib-tests: *bb_test + - barretenberg-stdlib-recursion-turbo-tests: *bb_test + - barretenberg-stdlib-recursion-ultra-tests: *bb_test + - barretenberg-join-split-tests: *bb_test + - barretenberg-benchmark-aggregator: + requires: + - barretenberg-tests + - barretenberg-stdlib-tests + - barretenberg-stdlib-recursion-turbo-tests + - barretenberg-stdlib-recursion-ultra-tests + - barretenberg-join-split-tests + filters: + branches: + only: + - master + <<: *defaults + - bb-js: + requires: + - barretenberg-wasm-linux-clang + <<: *defaults + - bb-js-tests: + requires: + - bb-js + <<: *defaults + - barretenberg-acir-tests: + requires: + - barretenberg-x86_64-linux-clang-assert + - bb-js + <<: *defaults + - circuits-wasm-linux-clang: *defaults + - circuits-wasm-linux-clang-assert: *defaults + - circuits-x86_64-linux-clang-tidy: *defaults + - circuits-x86_64-linux-clang: *defaults + - circuits-x86_64-linux-clang-assert: *defaults + - circuits-wasm-tests: + <<: *circuits-wasm-test + - circuits-x86_64-tests: + <<: *circuits-x86_64-test + + - circuits-end: + requires: + - circuits-wasm-linux-clang + - circuits-wasm-linux-clang-assert + - circuits-x86_64-linux-clang-tidy + - circuits-x86_64-linux-clang + - circuits-x86_64-linux-clang-assert + - circuits-wasm-tests + - circuits-x86_64-tests + <<: *defaults + + - l1-contracts: *defaults + - noir-contracts-build: *defaults + + - yarn-project-base: + requires: + - circuits-wasm-linux-clang + - l1-contracts + - noir-contracts-build + <<: *defaults + + - aztec-js: *yarn_project + - end-to-end: *yarn_project + - ethereum: *yarn_project + - foundation: *yarn_project + - world-state: *yarn_project + - acir-simulator: *yarn_project + - archiver: *yarn_project + - aztec-rpc: *yarn_project + - aztec-node: *yarn_project + - aztec-cli: *yarn_project + - key-store: *yarn_project + - merkle-tree: *yarn_project + - p2p: *yarn_project + - p2p-bootstrap: *yarn_project + - l1-artifacts: *yarn_project + - noir-compiler: *yarn_project + - noir-contracts: *yarn_project + - sequencer-client: *yarn_project + - types: *yarn_project + - circuits-js: *yarn_project + - rollup-provider: *yarn_project + - aztec-sandbox: *yarn_project + - canary: *yarn_project + + - e2e-join: + requires: + - aztec-js + - end-to-end + - ethereum + - foundation + - world-state + - acir-simulator + - archiver + - aztec-rpc + - aztec-node + - aztec-cli + - key-store + - merkle-tree + - p2p + - p2p-bootstrap + - l1-artifacts + - noir-compiler + - noir-contracts + - sequencer-client + - types + - circuits-js + - rollup-provider + - aztec-sandbox + - canary + <<: *defaults + + - e2e-2-rpc-servers: *e2e_test + - e2e-deploy-contract: *e2e_test + - e2e-lending-contract: *e2e_test + - e2e-private-token-contract: *e2e_test + - e2e-sandbox-example: *e2e_test + - e2e-multi-transfer-contract: *e2e_test + - e2e-block-building: *e2e_test + - e2e-nested-contract: *e2e_test + - e2e-non-contract-account: *e2e_test + - e2e-multiple-accounts-1-enc-key: *e2e_test + - e2e-public-token-contract: *e2e_test + - e2e-cli: *e2e_test + - e2e-cross-chain-messaging: *e2e_test + - e2e-public-cross-chain-messaging: *e2e_test + - e2e-public-to-private-messaging: *e2e_test + - e2e-account-contracts: *e2e_test + - e2e-escrow-contract: *e2e_test + - e2e-pending-commitments-contract: *e2e_test + - e2e-ordering: *e2e_test + - uniswap-trade-on-l1-from-l2: *e2e_test + - integration-l1-publisher: *e2e_test + - integration-archiver-l1-to-l2: *e2e_test + - e2e-p2p: *e2e_test + - e2e-canary-test: *e2e_test + - e2e-browser-sandbox: *e2e_test + - aztec-rpc-sandbox: *e2e_test + - guides-writing-an-account-contract: *e2e_test + + - e2e-end: + requires: + - e2e-2-rpc-servers + - e2e-deploy-contract + - e2e-lending-contract + - e2e-private-token-contract + - e2e-sandbox-example + - e2e-multi-transfer-contract + - e2e-block-building + - e2e-nested-contract + - e2e-non-contract-account + - e2e-multiple-accounts-1-enc-key + - e2e-public-token-contract + - e2e-cli + - e2e-cross-chain-messaging + - e2e-public-cross-chain-messaging + - e2e-public-to-private-messaging + - e2e-account-contracts + - e2e-escrow-contract + - e2e-pending-commitments-contract + - e2e-ordering + - uniswap-trade-on-l1-from-l2 + - integration-l1-publisher + - integration-archiver-l1-to-l2 + - e2e-p2p + - e2e-browser-sandbox + - e2e-canary-test + - aztec-rpc-sandbox + - guides-writing-an-account-contract + <<: *defaults + + - deploy-dockerhub: + requires: + - e2e-end + <<: *deploy_defaults + - deploy-npm: + requires: + - e2e-end + <<: *deploy_defaults + + - deploy-end: + requires: + - deploy-dockerhub + - deploy-npm + <<: *deploy_defaults + + - build-deployment-canary: + requires: + - deploy-end + <<: *deploy_defaults + + - run-deployment-canary-uniswap: + requires: + - build-deployment-canary + <<: *deploy_defaults + + - run-deployment-canary-browser: + requires: + - build-deployment-canary + <<: *deploy_defaults + + - run-deployment-canary-cli: + requires: + - build-deployment-canary + <<: *deploy_defaults From d945d40e840879e7b5f1cd19eb332a26659dd794 Mon Sep 17 00:00:00 2001 From: Maddiaa0 <47148561+Maddiaa0@users.noreply.github.com> Date: Sun, 3 Sep 2023 17:37:14 +0000 Subject: [PATCH 6/6] fix: rm unused cpp objects --- docs/.dockerignore | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/.dockerignore b/docs/.dockerignore index b2ce352e7c25..7e43ece4f421 100644 --- a/docs/.dockerignore +++ b/docs/.dockerignore @@ -7,11 +7,6 @@ *.LICENSE # Ignore C++ object files and executables -*.o -*.out -*.exe -*.so -*.a build/ Debug/ Release/