Skip to content

Commit 6852366

Browse files
committed
update PR #13605
1 parent f3c7b14 commit 6852366

2 files changed

Lines changed: 37 additions & 41 deletions

File tree

.github/workflows/reports.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1090,7 +1090,7 @@ jobs:
10901090
# This is a job which depends on all test jobs and reports the overall status.
10911091
# This allows us to add/remove test jobs without having to update the required workflows.
10921092
reports-end:
1093-
name: End
1093+
name: Report End
10941094
runs-on: ubuntu-22.04
10951095
timeout-minutes: 5
10961096
permissions:

.github/workflows/test-js-packages.yml

Lines changed: 36 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -746,50 +746,46 @@ jobs:
746746
exit 1
747747
fi
748748
749-
# `noir-contracts` does not compile against this branch: the pinned aztec-packages
750-
# commit uses the comptime reflection APIs which now return named structs rather
751-
# than tuples. Restore this job once that commit is bumped to a revision that
752-
# compiles.
753-
# compile-noir-contracts:
754-
# name: Compile `noir-contracts` zero inliner aggressiveness
755-
# needs: [build-binaries]
756-
# runs-on: ubuntu-22.04
757-
# timeout-minutes: 30
758-
# permissions:
759-
# contents: read
760-
# steps:
761-
# - name: Checkout
762-
# uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
763-
# with:
764-
# # Note that we are checking out into a sub-directory, which affects action paths.
765-
# path: noir-repo
749+
compile-noir-contracts:
750+
name: Compile `noir-contracts` zero inliner aggressiveness
751+
needs: [build-binaries]
752+
runs-on: ubuntu-22.04
753+
timeout-minutes: 30
754+
permissions:
755+
contents: read
756+
steps:
757+
- name: Checkout
758+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
759+
with:
760+
# Note that we are checking out into a sub-directory, which affects action paths.
761+
path: noir-repo
766762

767-
# - name: Resolve pinned aztec-packages commit
768-
# id: aztec-commit
769-
# run: echo "commit=$(yq '.define' ./noir-repo/EXTERNAL_NOIR_LIBRARIES.yml)" >> "$GITHUB_OUTPUT"
763+
- name: Resolve pinned aztec-packages commit
764+
id: aztec-commit
765+
run: echo "commit=$(yq '.define' ./noir-repo/EXTERNAL_NOIR_LIBRARIES.yml)" >> "$GITHUB_OUTPUT"
770766

771-
# - name: Checkout
772-
# uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
773-
# with:
774-
# repository: AztecProtocol/aztec-packages
775-
# ref: ${{ steps.aztec-commit.outputs.commit }}
776-
# path: test-repo
767+
- name: Checkout
768+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
769+
with:
770+
repository: AztecProtocol/aztec-packages
771+
ref: ${{ steps.aztec-commit.outputs.commit }}
772+
path: test-repo
777773

778-
# - name: Download nargo binary
779-
# uses: ./noir-repo/.github/actions/download-binary
780-
# with:
781-
# name: nargo
774+
- name: Download nargo binary
775+
uses: ./noir-repo/.github/actions/download-binary
776+
with:
777+
name: nargo
782778

783-
# - name: Remove requirements on compiler version
784-
# working-directory: ./test-repo
785-
# run: |
786-
# # Github actions seems to not expand "**" in globs by default.
787-
# shopt -s globstar
788-
# sed -i '/^compiler_version/d' ./**/Nargo.toml
779+
- name: Remove requirements on compiler version
780+
working-directory: ./test-repo
781+
run: |
782+
# Github actions seems to not expand "**" in globs by default.
783+
shopt -s globstar
784+
sed -i '/^compiler_version/d' ./**/Nargo.toml
789785
790-
# - name: Run nargo compile
791-
# working-directory: ./test-repo/noir-projects/labs/noir-contracts
792-
# run: nargo compile --inliner-aggressiveness 0
786+
- name: Run nargo compile
787+
working-directory: ./test-repo/noir-projects/labs/noir-contracts
788+
run: nargo compile --inliner-aggressiveness 0
793789

794790
upload_critical_library_report:
795791
name: Upload critical library report
@@ -884,7 +880,7 @@ jobs:
884880
#- test-integration-browser
885881
- test-nargo-doc
886882
- test-examples
887-
# - compile-noir-contracts
883+
- compile-noir-contracts
888884
permissions:
889885
contents: read
890886

0 commit comments

Comments
 (0)