chore: origin tags 0 #20084

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

Merged

ledwards2225 merged 23 commits into merge-train/barretenberg from lde/origin-tags-0

Feb 12, 2026

+939 −1,804

.github/workflows/ci3.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -261,46 +261,3 @@ jobs: @@
               AWS_SHUTDOWN_TIME: 180
             run: |
               ./.github/ci3.sh network-tests-kind
-      # iOS cross-compilation build for barretenberg.
-      # Runs in parallel with the main CI job on every PR (~9 min per target).
-      # This builds the bb-external static library for iOS devices and simulators.
-      # Non-blocking (continue-on-error) to avoid rugging releases - alerts #honk-team on failure.
-      build-bb-ios:
-        name: Build iOS static libraries
-        runs-on: macos-14
-        if: github.event.pull_request.head.repo.fork != true && github.event.pull_request.draft == false
-        continue-on-error: true
-        strategy:
-          fail-fast: false
-          matrix:
-            include:
-              - preset: ios-arm64
-                label: arm64-ios
-              - preset: ios-sim-arm64
-                label: arm64-ios-sim
-        steps:
-          - name: Checkout
-            uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
-          - name: Create Build Environment
-            run: |
-              brew install cmake ninja
-          - name: Compile bb-external for iOS
-            working-directory: barretenberg/cpp
-            run: |
-              cmake --preset ${{ matrix.preset }}
-              cmake --build --preset ${{ matrix.preset }} --target bb-external
-          - name: Notify Slack on failure
-            if: failure()
-            env:
-              SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
-            run: |
-              if [ -n "${SLACK_BOT_TOKEN}" ]; then
-                curl -X POST https://slack.com/api/chat.postMessage \
-                  -H "Authorization: Bearer $SLACK_BOT_TOKEN" \
-                  -H "Content-type: application/json" \
-                  --data "{\"channel\": \"#honk-team\", \"text\": \"iOS build (${{ matrix.preset }}) FAILED: <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}|View Run>\"}"
-              fi

.github/workflows/publish-bb-mac.yml

This file was deleted.

barretenberg/CLAUDE.md

-Original file line number
+Diff line change
@@ Expand Up @@
     **IMPORTANT**: When comparing branches or looking at diffs for barretenberg work, use `origin/merge-train/barretenberg` as the base branch, NOT `master` or `next`. Create new branches off `origin/merge-train/barretenberg` and target PRs to `merge-train/barretenberg`.
-    Examples:
-    - `git checkout -b my-branch origin/merge-train/barretenberg` (create a new branch)
+    ## Creating a new branch
+    **Always fetch the latest changes before creating a new branch:**
+    ```bash
+    git fetch origin merge-train/barretenberg
+    git checkout -b my-branch origin/merge-train/barretenberg
+    ```
+    ## Rebasing your branch
+    When your branch becomes out-of-date with the base branch, rebase (don't merge):
+    ```bash
+    git fetch origin merge-train/barretenberg
+    git rebase origin/merge-train/barretenberg
+    git push -f  # Force push after rebase (only when necessary)
+    ```
+    **During active development:** Avoid `git push --force` when iterating on changes - use regular `git push` after each commit to make iteration history visible. Only use force-push after rebasing or when you need to rewrite history.
+    ## Common commands
     - `git diff origin/merge-train/barretenberg...HEAD` (not `git diff master...HEAD`)
     - `git log origin/merge-train/barretenberg..HEAD` (not `git log master..HEAD`)
     - `gh pr create --base merge-train/barretenberg` (target PRs to merge-train)
@@ Expand All @@
     Run ./bootstrap.sh at the top-level to be sure the repo fully builds.
     Bootstrap scripts can be called with relative paths e.g. ../barretenberg/bootstrap.sh
+    ## CI labels for PRs
+    Add GitHub labels to PRs to control what CI runs. Choose based on what changed:
+    - **`ci-barretenberg`** — Barretenberg-only builds (default for `merge-train/barretenberg` branch). Core tests, no cross-compilation.
+    - **`ci-barretenberg-full`** or **`ci-full`** — Full builds including cross-compilation (macOS, iOS, ARM64 Linux), SMT verification, ASAN, and GCC syntax checks. Use when changing CMake presets, bootstrap.sh, or build infrastructure.
+    - **`ci-release-pr`** — Creates a test release tag for pre-release validation. Use when changing release packaging or publish workflows.
+    ## Handling noir/noir-repo submodule
+    If `git status` shows `noir/noir-repo` as modified but your changes have nothing to do with updating noir, run:
+    ```bash
+    git submodule update noir/noir-repo
+    ```
+    This resets the submodule to the correct commit for the current branch. This commonly happens when switching branches.
+    **Note:** If you're intentionally updating the noir submodule to a newer version, use the `noir-sync-update` skill instead, which handles the full update workflow including `Cargo.lock` and `yarn.lock` updates.
     # Modules
     ## ts/ => typescript code for bb.js
@@ Expand Down @@

barretenberg/cpp/.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -19,3 +19,5 @@ bench-out @@
     src/barretenberg/avm_fuzzer/corpus/**
     src/barretenberg/avm_fuzzer/coverage/**
     out
+    ios-sdk/
+    android-sysroot/

barretenberg/cpp/CMakePresets.json

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -532,35 +532,65 @@
  
          }

        },

        {

          "name": "ios-arm64",

          "displayName": "Build for iOS arm64 (device)",

          "description": "Build for iOS arm64 devices using ios.toolchain.cmake",

          "binaryDir": "build-ios-arm64",

          "generator": "Ninja",

          "toolchainFile": "cmake/toolchains/ios.toolchain.cmake",

          "name": "zig-arm64-ios",

          "displayName": "iOS arm64 static library (Zig)",

          "description": "Cross-compile static libraries for iOS arm64 devices using Zig. Only supports static library targets (no linking) — Zig lacks iOS TBD/dylib support.",

          "inherits": "zig-base",

          "environment": {

            "CC": "zig cc -target aarch64-ios -mios-version-min=16.3 -isystem ${sourceDir}/ios-sdk/iPhoneOS26.2.sdk/usr/include",

            "CXX": "zig c++ -target aarch64-ios -mios-version-min=16.3 -isystem ${sourceDir}/ios-sdk/iPhoneOS26.2.sdk/usr/include"

          },

          "cacheVariables": {

            "PLATFORM": "OS64",

            "DEPLOYMENT_TARGET": "16.3",

            "CMAKE_BUILD_TYPE": "Release",

            "ENABLE_PIC": "ON",

            "ENABLE_ARC": "OFF",

            "CMAKE_SYSTEM_NAME": "Generic",

            "CMAKE_TRY_COMPILE_TARGET_TYPE": "STATIC_LIBRARY",

            "HAVE_STD_REGEX": "ON",

            "MOBILE": "ON"

          }

        },

        {

          "name": "ios-sim-arm64",

          "displayName": "Build for iOS Simulator arm64",

          "description": "Build for iOS Simulator on Apple Silicon using ios.toolchain.cmake",

          "binaryDir": "build-ios-sim-arm64",

          "generator": "Ninja",

          "toolchainFile": "cmake/toolchains/ios.toolchain.cmake",

          "name": "zig-arm64-ios-sim",

          "displayName": "iOS Simulator arm64 static library (Zig)",

          "description": "Cross-compile static libraries for iOS Simulator on ARM64 using Zig. Only supports static library targets (no linking) — Zig lacks iOS TBD/dylib support.",

          "inherits": "zig-base",

          "environment": {

            "CC": "zig cc -target aarch64-ios-simulator -mios-version-min=16.3 -isystem ${sourceDir}/ios-sdk/iPhoneOS26.2.sdk/usr/include",

            "CXX": "zig c++ -target aarch64-ios-simulator -mios-version-min=16.3 -isystem ${sourceDir}/ios-sdk/iPhoneOS26.2.sdk/usr/include"

          },

          "cacheVariables": {

            "PLATFORM": "SIMULATORARM64",

            "DEPLOYMENT_TARGET": "16.3",

            "CMAKE_BUILD_TYPE": "Release",

            "ENABLE_PIC": "ON",

            "ENABLE_ARC": "OFF",

            "CMAKE_SYSTEM_NAME": "Generic",

            "CMAKE_TRY_COMPILE_TARGET_TYPE": "STATIC_LIBRARY",

            "HAVE_STD_REGEX": "ON",

            "MOBILE": "ON"

          }

        },

        {

          "name": "zig-arm64-android",

          "displayName": "Android arm64 static library (Zig)",

          "description": "Cross-compile static libraries for Android arm64 devices using Zig. Only supports static library targets (no linking).",

          "inherits": "zig-base",

          "environment": {

            "CC": "zig cc -target aarch64-linux-android -isystem ${sourceDir}/android-sysroot/usr/include -isystem ${sourceDir}/android-sysroot/usr/include/aarch64-linux-android",

            "CXX": "zig c++ -target aarch64-linux-android -isystem ${sourceDir}/android-sysroot/usr/include -isystem ${sourceDir}/android-sysroot/usr/include/aarch64-linux-android"

          },

          "cacheVariables": {

            "CMAKE_SYSTEM_NAME": "Generic",

            "CMAKE_TRY_COMPILE_TARGET_TYPE": "STATIC_LIBRARY",

            "HAVE_STD_REGEX": "ON",

            "MOBILE": "ON"

          }

        },

        {

          "name": "zig-x86_64-android",

          "displayName": "Android x86_64 static library (Zig)",

          "description": "Cross-compile static libraries for Android x86_64 emulator using Zig. Only supports static library targets (no linking).",

          "inherits": "zig-base",

          "environment": {

            "CC": "zig cc -target x86_64-linux-android -isystem ${sourceDir}/android-sysroot/usr/include -isystem ${sourceDir}/android-sysroot/usr/include/x86_64-linux-android",

            "CXX": "zig c++ -target x86_64-linux-android -isystem ${sourceDir}/android-sysroot/usr/include -isystem ${sourceDir}/android-sysroot/usr/include/x86_64-linux-android"

          },

          "cacheVariables": {

            "CMAKE_SYSTEM_NAME": "Generic",

            "CMAKE_TRY_COMPILE_TARGET_TYPE": "STATIC_LIBRARY",

            "HAVE_STD_REGEX": "ON",

            "MOBILE": "ON"

          }

    @@ -753,13 +783,23 @@
  
          "inheritConfigureEnvironment": true

        },

        {

          "name": "ios-arm64",

          "configurePreset": "ios-arm64",

          "name": "zig-arm64-ios",

          "configurePreset": "zig-arm64-ios",

          "inheritConfigureEnvironment": true

        },

        {

          "name": "zig-arm64-ios-sim",

          "configurePreset": "zig-arm64-ios-sim",

          "inheritConfigureEnvironment": true

        },

        {

          "name": "zig-arm64-android",

          "configurePreset": "zig-arm64-android",

          "inheritConfigureEnvironment": true

        },

        {

          "name": "ios-sim-arm64",

          "configurePreset": "ios-sim-arm64",

          "name": "zig-x86_64-android",

          "configurePreset": "zig-x86_64-android",

          "inheritConfigureEnvironment": true

        }

      ],

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: origin tags 0 #20084

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!