Skip to content

Commit

Permalink
asdf
Browse files Browse the repository at this point in the history
  • Loading branch information
sklppy88 committed Dec 18, 2023
1 parent eaf6d80 commit ecd0e60
Show file tree
Hide file tree
Showing 6 changed files with 86 additions and 7 deletions.
4 changes: 4 additions & 0 deletions .github/scripts/build-nargo.sh
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
5 changes: 5 additions & 0 deletions .github/scripts/test-backend-barretenberg.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
set -eu

cd /usr/src/noir
yarn workspace @noir-lang/backend_barretenberg build
5 changes: 5 additions & 0 deletions .github/scripts/test-noir-codegen.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
set -eu

cd /usr/src/noir
yarn workspace @noir-lang/noir_codegen build
5 changes: 5 additions & 0 deletions .github/scripts/test-noir-js.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
set -eu

cd /usr/src/noir
yarn workspace @noir-lang/noir_js build
44 changes: 43 additions & 1 deletion .github/workflows/docker-test-flow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,4 +154,46 @@ jobs:
steps:
- name: test
run: |
/usr/src/noir/.github/scripts/test-noirc-abi.sh
/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
30 changes: 24 additions & 6 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -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 . .

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit ecd0e60

Please sign in to comment.