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

chore: fix sync scripts #9423

Merged
merged 4 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
1 change: 0 additions & 1 deletion noir/.rebuild_patterns_packages
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
^noir/noir-repo/noir_stdlib
^noir/noir-repo/tooling/noir_codegen
^noir/noir-repo/tooling/noir_js
^noir/noir-repo/tooling/noir_js_backend_barretenberg
^noir/noir-repo/tooling/noir_js_types
^noir/noir-repo/tooling/noirc_abi
^noir/noir-repo/tooling/noirc_abi_wasm
31 changes: 0 additions & 31 deletions noir/noir-repo/docs/docusaurus.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -181,37 +181,6 @@ export default {
membersWithOwnFile: ['Interface', 'Class', 'TypeAlias', 'Function'],
},
],
[
'docusaurus-plugin-typedoc',
{
id: 'noir_js_backend_barretenberg',
entryPoints: ['../tooling/noir_js_backend_barretenberg/src/index.ts'],
tsconfig: '../tooling/noir_js_backend_barretenberg/tsconfig.json',
entryPointStrategy: 'resolve',
out: 'processed-docs/reference/NoirJS/backend_barretenberg',
plugin: ['typedoc-plugin-markdown'],
name: 'backend_barretenberg',
disableSources: true,
excludePrivate: true,
skipErrorChecking: true,
sidebar: {
filteredIds: ['reference/NoirJS/backend_barretenberg/index'],
},
readme: 'none',
hidePageHeader: true,
hideBreadcrumbs: true,
hideInPageTOC: true,
useCodeBlocks: true,
typeDeclarationFormat: 'table',
propertiesFormat: 'table',
parametersFormat: 'table',
enumMembersFormat: 'table',
indexFormat: 'table',
outputFileStrategy: 'members',
memberPageTitle: '{name}',
membersWithOwnFile: ['Interface', 'Class', 'TypeAlias'],
},
],
[
'docusaurus-plugin-typedoc',
{
Expand Down
4 changes: 2 additions & 2 deletions noir/scripts/sync-in-fixup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -eu
cd $(dirname $0)/../noir-repo

tmp=$(mktemp)
BACKEND_BARRETENBERG_PACKAGE_JSON=./tooling/noir_js_backend_barretenberg/package.json
BACKEND_BARRETENBERG_PACKAGE_JSON=./compiler/integration-tests/package.json

jq -r '.dependencies."@aztec/bb.js"' $BACKEND_BARRETENBERG_PACKAGE_JSON > ../bb-version
jq '.dependencies."@aztec/bb.js" = "portal:../../../../barretenberg/ts"' $BACKEND_BARRETENBERG_PACKAGE_JSON > $tmp && mv $tmp $BACKEND_BARRETENBERG_PACKAGE_JSON
Expand All @@ -15,4 +15,4 @@ YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install

# Remove requirement for `wasm-opt` to be installed
sed -i "s/^require_command wasm-opt/#require_command wasm-opt/" ./tooling/noirc_abi_wasm/build.sh
sed -i "s/^require_command wasm-opt/#require_command wasm-opt/" ./acvm-repo/acvm_js/build.sh
sed -i "s/^require_command wasm-opt/#require_command wasm-opt/" ./acvm-repo/acvm_js/build.sh
4 changes: 2 additions & 2 deletions noir/scripts/sync-out-fixup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cd $(dirname $0)/../noir-repo
BB_VERSION=$(cat ../bb-version)

tmp=$(mktemp)
BACKEND_BARRETENBERG_PACKAGE_JSON=./tooling/noir_js_backend_barretenberg/package.json
BACKEND_BARRETENBERG_PACKAGE_JSON=./compiler/integration-tests/package.json
jq --arg v $BB_VERSION '.dependencies."@aztec/bb.js" = $v' $BACKEND_BARRETENBERG_PACKAGE_JSON > $tmp && mv $tmp $BACKEND_BARRETENBERG_PACKAGE_JSON

# This script runs in CI which enforces immutable installs by default,
Expand All @@ -15,4 +15,4 @@ YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install

# Add requirement for `wasm-opt` to be installed
sed -i "s/^#require_command wasm-opt/require_command wasm-opt/" ./tooling/noirc_abi_wasm/build.sh
sed -i "s/^#require_command wasm-opt/require_command wasm-opt/" ./acvm-repo/acvm_js/build.sh
sed -i "s/^#require_command wasm-opt/require_command wasm-opt/" ./acvm-repo/acvm_js/build.sh
Loading