diff --git a/.github/scripts/build-nargo.sh b/.github/scripts/build-nargo.sh index 45928e6fe64..6d09d91ab33 100755 --- a/.github/scripts/build-nargo.sh +++ b/.github/scripts/build-nargo.sh @@ -1,3 +1,7 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir export SOURCE_DATE_EPOCH=$(date +%s) export GIT_DIRTY=false export GIT_COMMIT=$(git rev-parse --verify HEAD) diff --git a/.github/scripts/test-backend-barretenberg.sh b/.github/scripts/test-backend-barretenberg.sh new file mode 100755 index 00000000000..673d86148f1 --- /dev/null +++ b/.github/scripts/test-backend-barretenberg.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +yarn workspace @noir-lang/backend_barretenberg build \ No newline at end of file diff --git a/.github/scripts/test-noir-codegen.sh b/.github/scripts/test-noir-codegen.sh new file mode 100755 index 00000000000..c6940150e89 --- /dev/null +++ b/.github/scripts/test-noir-codegen.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +yarn workspace @noir-lang/noir_codegen build \ No newline at end of file diff --git a/.github/scripts/test-noir-js.sh b/.github/scripts/test-noir-js.sh new file mode 100755 index 00000000000..3394d1867ba --- /dev/null +++ b/.github/scripts/test-noir-js.sh @@ -0,0 +1,5 @@ +#!/bin/bash +set -eu + +cd /usr/src/noir +yarn workspace @noir-lang/noir_js build \ No newline at end of file diff --git a/.github/workflows/docker-test-flow.yml b/.github/workflows/docker-test-flow.yml index 3c917f61b31..12979177630 100644 --- a/.github/workflows/docker-test-flow.yml +++ b/.github/workflows/docker-test-flow.yml @@ -154,4 +154,46 @@ jobs: steps: - name: test run: | - /usr/src/noir/.github/scripts/test-noirc-abi.sh \ No newline at end of file + /usr/src/noir/.github/scripts/test-noirc-abi.sh + + test-barretenberg-backend: + name: test barretenberg backend + runs-on: ubuntu-latest + needs: [build-base-js, test-noirc-abi] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: test + run: | + /usr/src/noir/.github/scripts/test-backend-barretenberg.sh + + test-noir_js: + name: test noirjs + runs-on: ubuntu-latest + needs: [build-base-js, test-noirc-abi] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: test + run: | + /usr/src/noir/.github/scripts/test-noir-js.sh + + test-noir_codegen: + name: test noir codegen + runs-on: ubuntu-latest + needs: [build-base-js, test-noirc-abi] + container: + image: ghcr.io/noir-lang/noir:${{ github.sha }}-js + credentials: + username: ${{ github.actor }} + password: ${{ secrets.github_token }} + steps: + - name: test + run: | + /usr/src/noir/.github/scripts/test-noir-codegen.sh \ No newline at end of file diff --git a/Dockerfile.ci b/Dockerfile.ci index 3d694603cba..0cb3b0a416e 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -19,11 +19,29 @@ COPY yarn.lock package.json .yarnrc.yml ./ COPY .yarn/ ./.yarn/ # acvm-js COPY ./acvm-repo/acvm_js/package.json ./acvm-repo/acvm_js/ +# noirc abi COPY ./tooling/noirc_abi_wasm/package.json ./tooling/noirc_abi_wasm/ +# noir wasm COPY ./compiler/wasm/package.json ./compiler/wasm/ +# source resolver COPY ./compiler/source-resolver/package.json ./compiler/source-resolver/ -RUN yarn +#! Things rely on this +COPY ./tooling/noir_js_types/package.json ./tooling/noir_js_types/ + +#backend barretenberg +COPY ./tooling/noir_js_backend_barretenberg/package.json ./tooling/noir_js_backend_barretenberg/ + +COPY ./tooling/noir_js/package.json ./tooling/noir_js/ + +COPY ./tooling/noir_codegen/package.json ./tooling/noir_codegen/ + +### NEW ADDED +COPY ./compiler/integration-tests/package.json ./compiler/integration-tests/ +COPY ./release-tests/package.json ./release-tests/ +COPY ./docs/package.json ./docs/ + +RUN yarn --immutable # RUN yarn --immutable COPY . . @@ -82,11 +100,11 @@ RUN corepack enable RUN yarn --immutable RUN apt-get install -y jq RUN yarn build -RUN yarn workspace @noir-lang/acvm_js test -RUN npx playwright install && npx playwright install-deps -RUN yarn workspace @noir-lang/acvm_js test:browser -RUN yarn workspace @noir-lang/noirc_abi test -RUN yarn workspace @noir-lang/noirc_abi test:browser +# RUN yarn workspace @noir-lang/acvm_js test +# RUN npx playwright install && npx playwright install-deps +# RUN yarn workspace @noir-lang/acvm_js test:browser +# RUN yarn workspace @noir-lang/noirc_abi test +# RUN yarn workspace @noir-lang/noirc_abi test:browser RUN yarn workspace @noir-lang/backend_barretenberg test RUN ./scripts/nargo_compile_noir_js_assert_lt.sh RUN rm -rf /usr/src/noir/tooling/noir_js/test/noir_compiled_examples/assert_lt/target/debug_assert_lt.json