Merge branch 'main' into me/list-versions

Savio-Sou · web-flow · commit ee9f988d272c · 2025-02-26T02:09:46.000+09:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,16 +13,45 @@ permissions:
 env:
   REPO: ${{ github.event.pull_request.head.repo.full_name || github.repository }}
   REF: ${{ github.head_ref || github.ref_name }}
+  MINIMUM_NOIR_VERSION: v0.16.0
 
 jobs:
+  noir-version-list:
+    name: Query supported Noir versions
+    runs-on: ubuntu-latest
+    outputs:
+      noir_versions: ${{ steps.get_versions.outputs.versions }}
+
+    steps:
+      - name: Checkout sources
+        id: get_versions
+        run: |         
+          # gh returns the Noir releases in reverse chronological order so we keep all releases published after the minimum supported version.
+          VERSIONS=$(gh release list -R noir-lang/noir --exclude-pre-releases --json tagName -q 'map(.tagName) | index(env.MINIMUM_NOIR_VERSION) as $index | if $index then .[0:$index+1] else [env.MINIMUM_NOIR_VERSION] end')
+          echo "versions=$VERSIONS"
+          echo "versions=$VERSIONS" >> $GITHUB_OUTPUT
+        env:
+          GH_TOKEN: ${{ github.token }}
+
+
   install:
     name: Noir ${{matrix.toolchain}} (CLI) on ${{matrix.os == 'ubuntu' && 'Linux' || matrix.os == 'macos' && 'macOS' || matrix.os == 'windows' && 'Windows' || '???'}}
+    needs: [noir-version-list]
     runs-on: ${{matrix.os}}-latest
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu, macos]
-        toolchain: [stable, nightly, 0.1.0, 0.1.1, 0.2.0, 0.3.0, 0.4.1]
+        toolchain: ${{ fromJson( needs.noir-version-list.outputs.noir_versions )}}
+        include:
+          - os: ubuntu 
+            toolchain: nightly
+          - os: ubuntu 
+            toolchain: stable
+          - os: macos 
+            toolchain: nightly
+          - os: macos 
+            toolchain: stable
     timeout-minutes: 45
     steps:
       - name: Parse toolchain
@@ -50,17 +79,44 @@ jobs:
         run: noirup ${{steps.parse.outputs.toolchain}}
       - name: Check nargo installation
         run: nargo --version
+      - name: Check noir-inspector installation
+        run: |
+          # Fetch the version from `nargo` as to also check the `stable` and `nightly` toolchains
+          VERSION=$(nargo --version | awk -F' = ' '/nargo version/ {print $2}')
+          MIN_VERSION="1.0.0-beta.3"
+
+          version_gte() {
+            [ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" = "$2" ]
+          }
+
+          if version_gte "$VERSION" "$MIN_VERSION"; then
+            noir-inspector --version
+          fi
+      - name: Check noir-profiler installation
+        run: |
+          # Fetch the version from `nargo` as to also check the `stable` and `nightly` toolchains
+          VERSION=$(nargo --version | awk -F' = ' '/nargo version/ {print $2}')
+          MIN_VERSION="1.0.0-beta.3"
+
+          version_gte() {
+            [ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" = "$2" ]
+          }
+
+          if version_gte "$VERSION" "$MIN_VERSION"; then
+            noir-profiler --version
+          fi
 
   install-source:
     name: Noir ${{matrix.version}} (from source) on ${{matrix.os == 'ubuntu' && 'Linux' || matrix.os == 'macos' && 'macOS' || matrix.os == 'windows' && 'Windows' || '???'}}
+    needs: [noir-version-list]
     runs-on: ${{matrix.os}}-latest
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu, macos]
         # Installing from source can technically target any commit.
         # However, we only guarantee that noirup will build release commits.
-        version: [0.1.0, 0.1.1, 0.2.0, 0.3.0, 0.4.1]
+        os: [ubuntu, macos]
+        version: ${{ fromJson( needs.noir-version-list.outputs.noir_versions )}}
     timeout-minutes: 45
     steps:
       - name: Install noirup
@@ -80,29 +136,57 @@ jobs:
             ~/.cargo/git/db/
           key: ${{ runner.os }}-cargo-${{ matrix.version }}
 
-      - name: Install Barretenberg dependencies
-        if: matrix.os == 'ubuntu'
-        run: sudo apt update && sudo apt install clang lld cmake libomp-dev
-
-      - name: Install Barretenberg dependencies
-        if: matrix.os == 'macos'
-        run: brew install cmake llvm libomp
-
       - name: Install nargo from source with noirup
         run: noirup $toolchain
         env:
-          toolchain: -b tags/v${{matrix.version}}
+          toolchain: -b tags/${{matrix.version}}
       - name: Check nargo installation
         run: nargo --version
+      - name: Check noir-inspector installation
+        run: |
+          # Fetch the version from `nargo` as to also check the `stable` and `nightly` toolchains
+          VERSION=$(nargo --version | awk -F' = ' '/nargo version/ {print $2}')
+          MIN_VERSION="1.0.0-beta.3"
+
+          version_gte() {
+            [ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" = "$2" ]
+          }
+
+          if version_gte "$VERSION" "$MIN_VERSION"; then
+            noir-inspector --version
+          fi
+      - name: Check noir-profiler installation
+        run: |
+          # Minimum version which began releasing binaries for the `noir-profiler`
+          # Account for the extra `v` that prefixes "${{matrix.version}}"
+          MIN_VERSION="v1.0.0-beta.3"
+
+          version_gte() {
+            [ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" = "$2" ]
+          }
+
+          if version_gte ${{matrix.version}} "$MIN_VERSION"; then
+            noir-profiler --version
+          fi
 
   install-action:
     name: Noir ${{matrix.toolchain}} (GH action) on ${{matrix.os == 'ubuntu' && 'Linux' || matrix.os == 'macos' && 'macOS' || matrix.os == 'windows' && 'Windows' || '???'}}
+    needs: [noir-version-list]
     runs-on: ${{matrix.os}}-latest
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu, macos]
-        toolchain: [stable, nightly, 0.1.0, 0.1.1, 0.2.0, 0.3.0, 0.4.1]
+        toolchain: ${{ fromJson( needs.noir-version-list.outputs.noir_versions )}}
+        include:
+          - os: ubuntu 
+            toolchain: nightly
+          - os: ubuntu 
+            toolchain: stable
+          - os: macos 
+            toolchain: nightly
+          - os: macos 
+            toolchain: stable
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v3
@@ -115,22 +199,34 @@ jobs:
       - run: nargo new project
       - run: nargo check
         working-directory: ./project
-      - run: |
-          # Extract the minor version number from the version output
-          version=$(nargo --version)
-          version="${version#* }"
-          version="${version%% (*}"
-          minor=$(echo $version | cut -d '.' -f 2)
-
-          # The version in which the compile syntax changed
-          if [ "$minor" -lt 10 ]; then
-            nargo compile test-circuit
-          else
-            nargo compile
-          fi
-        name: nargo compile
+      - run: nargo compile
         working-directory: ./project
-        shell: bash
       - run: nargo test
-        if: matrix.toolchain != '0.1.0'
         working-directory: ./project
+      - name: Check noir-inspector installation
+        run: |
+          # Fetch the version from `nargo` as to also check the `stable` and `nightly` toolchains
+          VERSION=$(nargo --version | awk -F' = ' '/nargo version/ {print $2}')
+          MIN_VERSION="1.0.0-beta.3"
+
+          version_gte() {
+            [ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" = "$2" ]
+          }
+
+          if version_gte "$VERSION" "$MIN_VERSION"; then
+            noir-inspector --version
+          fi
+      - name: Check noir-profiler installation
+        working-directory: ./project
+        run: |
+          VERSION=$(nargo --version | awk -F' = ' '/nargo version/ {print $2}')
+          MIN_VERSION="1.0.0-beta.3"
+
+          version_gte() {
+            [ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" = "$2" ]
+          }
+
+          if version_gte "$VERSION" "$MIN_VERSION"; then
+            noir-profiler --version
+            noir-profiler opcodes -a ./target/project.json -o ./target
+          fi
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.1.4](https://github.com/noir-lang/noirup/compare/v0.1.3...v0.1.4) (2025-02-20)
+
+
+### Features
+
+* Install noir-profiler and noir-inspector ([#46](https://github.com/noir-lang/noirup/issues/46)) ([cf71599](https://github.com/noir-lang/noirup/commit/cf71599ddf5dc57486935d3bcba8f6ef07bb8850))
+
 ## [0.1.3](https://github.com/noir-lang/noirup/compare/v0.1.2...v0.1.3) (2023-09-05)
 
 
diff --git a/noirup b/noirup
@@ -4,6 +4,8 @@ set -e
 NARGO_HOME=${NARGO_HOME-"$HOME/.nargo"}
 NARGO_BIN_DIR="$NARGO_HOME/bin"
 
+BINARIES=("nargo" "noir-profiler" "noir-inspector")
+
 main() {
   need_cmd git
   need_cmd curl
@@ -66,10 +68,19 @@ main() {
     RUSTFLAGS="-C target-cpu=native" ensure cargo build --release $FEATURES # need 4 speed
 
     # Remove prior installations if they exist
-    rm -f "$NARGO_BIN_DIR/nargo"
+    for bin in "${BINARIES[@]}"; do
+      rm -f "$NARGO_BIN_DIR/$bin"
+    done
 
-    # Move the binary into the `nargo/bin` directory
-    ensure mv "$PWD/target/release/nargo" "$NARGO_BIN_DIR/nargo"
+    # Move binaries into the `.nargo/bin` directory
+    for bin in "${BINARIES[@]}"; do
+        # Move the binary only if it exists.
+        # This ensures compatibility with older versions of Noir, 
+        # which may not include all binaries listed.
+        if [ -f "$PWD/target/release/$bin" ]; then
+            ensure mv "$PWD/target/release/$bin" "$NARGO_BIN_DIR/$bin"
+        fi
+    done
 
     say "done"
     exit 0
@@ -125,14 +136,22 @@ main() {
         NOIRUP_TAG="${NOIRUP_VERSION}"
       fi
 
-      say "installing nargo (version ${NOIRUP_VERSION} with tag ${NOIRUP_TAG})"
+      say "installing Noir binaries (version ${NOIRUP_VERSION} with tag ${NOIRUP_TAG})"
 
       RELEASE_URL="https://github.com/${NOIRUP_REPO}/releases/download/${NOIRUP_TAG}"
     fi
-    BIN_TARBALL_URL="${RELEASE_URL}/nargo-${ARCHITECTURE}-${PLATFORM}.tar.gz"
+    # Current name for the binary tarball created by Noir.   
+    BIN_TARBALL_URL="${RELEASE_URL}/noir-${ARCHITECTURE}-${PLATFORM}.tar.gz"
+    
+    # Legacy naming uses the `nargo-` for when noir-lang/noir used to only release a single nargo binary 
+    # Use the legacy naming if `noir-` does not exist
+    # Force curl to follow redirects with `-L`
+    if ! curl -L --head --fail --silent "$BIN_TARBALL_URL" >/dev/null 2>&1; then
+        BIN_TARBALL_URL="${RELEASE_URL}/nargo-${ARCHITECTURE}-${PLATFORM}.tar.gz"
+    fi
 
     # Download the binaries tarball and unpack it into the .nargo bin directory.
-    say "downloading latest nargo to '$NARGO_BIN_DIR'"
+    say "downloading latest Noir binaries to '$NARGO_BIN_DIR'"
     ensure curl -# -L $BIN_TARBALL_URL | tar -xzC $NARGO_BIN_DIR
 
     # Prior to v0.3.0, Nargo and the std lib were distributed separated.
@@ -167,12 +186,22 @@ main() {
 
     RUSTFLAGS="-C target-cpu=native" ensure cargo build --release $FEATURES
 
-    # Remove prior installations if they exist
-    rm -f "$NARGO_BIN_DIR/nargo"
 
-    # Move the binary into the `nargo/bin` directory
-    ensure mv "$PWD/target/release/nargo" "$NARGO_BIN_DIR/nargo"
+    # Remove prior installations if they exist
+    for bin in "${BINARIES[@]}"; do
+      rm -f "$NARGO_BIN_DIR/$bin"
+    done
 
+    # Move binaries into the `.nargo/bin` directory
+    for bin in "${BINARIES[@]}"; do
+        # Move the binary only if it exists.
+        # This ensures compatibility with older versions of Noir, 
+        # which may not include all binaries listed.
+        if [ -f "$PWD/target/release/$bin" ]; then
+            ensure mv "$PWD/target/release/$bin" "$NARGO_BIN_DIR/$bin"
+        fi
+    done
+  
   fi
 
   if [[ $(which nargo) =~ "cargo" ]]; then
@@ -190,6 +219,7 @@ USAGE:
     noirup <OPTIONS>
 OPTIONS:
     -h, --help      Print help information
+    -n, --nightly   Install the nightly version
     -v, --version   Install a specific version
     -b, --branch    Install a specific branch
     -P, --pr        Install a specific Pull Request
diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.1.3
+0.1.4
