Merge branch 'next' into cl/install_dockerless

Author: charlielye

.github/ci3.sh

@@ -75,8 +75,9 @@ function determine_ci_mode {
     CI_MODE="docs"
   elif has_label "ci-barretenberg" || [ "${TARGET_BRANCH:-}" == "merge-train/barretenberg" ]; then
     CI_MODE="barretenberg"
-  elif [[ "${GITHUB_REF:-}" == *"-nightly."* ]] || [[ "${GITHUB_REF:-}" == *"-rc."* ]]; then
-    CI_MODE="nightly"
+  # We don't distinguish nightlies currently.
+  # elif [[ "${GITHUB_REF:-}" == *"-nightly."* ]] || [[ "${GITHUB_REF:-}" == *"-rc."* ]]; then
+  #   CI_MODE="nightly"
   elif [[ "${GITHUB_REF:-}" == refs/tags/v* ]]; then
     CI_MODE="release"
   else

.github/workflows/cancel-stale-workflows.yml

@@ -10,8 +10,6 @@ concurrency:
 
 jobs:
   cancel:
-    if: ${{ !github.event.pull_request.merged }}
-
     permissions:
       actions: write
       contents: read
@@ -26,6 +24,7 @@ jobs:
 
     steps:
       - name: Cancel active PR runs for ${{ matrix.workflow_id }}
+        continue-on-error: true
         uses: actions/github-script@5c56fde4671bc2d3592fb0f2c5b5bab9ddae03b1
         with:
           script: |
@@ -51,3 +50,4 @@ jobs:
                 });
               }
             }
+

.github/workflows/ci3-external.yml

@@ -83,6 +83,9 @@ jobs:
         env:
           SHOULD_SQUASH_MERGE: ${{ contains(github.event.pull_request.labels.*.name, 'ci-squash-and-merge') && '1' || '0' }}
           SHOULD_UPLOAD_BENCHMARKS: "0"
+          # For updating success cache.
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
           PR_NUMBER: ${{ github.event.pull_request.number }}
           PR_HEAD_REF: ${{ github.event.pull_request.head.ref }}

.github/workflows/ci3.yml

@@ -72,6 +72,9 @@ jobs:
         if: always()
         env:
           CI_INTERNAL: "1"
+          # For updating success cache.
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           SHOULD_SQUASH_MERGE: ${{ contains(github.event.pull_request.labels.*.name, 'ci-squash-and-merge') && '1' || '0' }}
           GITHUB_TOKEN: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
           PR_NUMBER: ${{ github.event.pull_request.number }}

.github/workflows/mirror-noir-subrepo.yml

@@ -10,6 +10,7 @@ on:
   schedule:
     # Run the workflow every night at 2:00 AM UTC.
     - cron: "0 2 * * *"
+  workflow_dispatch:
 
 jobs:
   mirror-to-barretenberg-repo:
@@ -18,6 +19,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
         with:
+          ref: next
           fetch-depth: 0
           token: ${{ secrets.AZTEC_BOT_GITHUB_TOKEN }}
       - name: Push to barretenberg repo
@@ -27,9 +29,10 @@ jobs:
           git config --global user.email [email protected]
 
           if ./scripts/git_subrepo.sh push $SUBREPO_PATH --branch=master; then
-            git fetch # in case a commit came after this
-            git rebase origin/master
+            git fetch origin next
+            git rebase origin/next
             git commit --amend -m "$(git log -1 --pretty=%B) [skip ci]"
-            git push
+            # We rely on the fixup logic instead
+            # git push origin next
           fi
 

.github/workflows/mirror-repos.yml

@@ -114,6 +114,18 @@ jobs:
         run: |
           ./scripts/cleanup_nightly_versions.sh
 
+      - name: Install Noir toolchain
+        uses: noir-lang/[email protected]
+        with:
+          toolchain: nightly
+
+      - name: Generate Aztec.nr API documentation
+        working-directory: ./docs
+        run: |
+          # Generate aztec-nr API docs for this version
+          ./scripts/aztec_nr_docs_generation/generate_aztec_nr_docs.sh ${{ env.NIGHTLY_TAG }}
+          echo "Generated Aztec.nr API docs for: ${{ env.NIGHTLY_TAG }}"
+
       - name: Create Aztec nightly docs version
         working-directory: ./docs
         run: |