From fdad2200f4764bc164377bc05175fc305c1c09be Mon Sep 17 00:00:00 2001 From: gmega Date: Fri, 16 Jan 2026 16:34:53 -0300 Subject: [PATCH] fix: remove cirdl from build; stop installing Rust; update Dockerfile; delete prover benchmarks --- .../actions/nimbus-build-system/action.yml | 12 --------- .github/workflows/artifacts.yml | 7 ----- .github/workflows/release.yml | 26 +++++-------------- docker/codex.Dockerfile | 5 ---- 4 files changed, 6 insertions(+), 44 deletions(-) diff --git a/.github/actions/nimbus-build-system/action.yml b/.github/actions/nimbus-build-system/action.yml index 4acbff33..0f55e36c 100644 --- a/.github/actions/nimbus-build-system/action.yml +++ b/.github/actions/nimbus-build-system/action.yml @@ -12,9 +12,6 @@ inputs: nim_version: description: "Nim version" default: "v2.0.14" - rust_version: - description: "Rust version" - default: "1.79.0" shell: description: "Shell to run commands in" default: "bash --noprofile --norc -e -o pipefail" @@ -24,13 +21,6 @@ inputs: runs: using: "composite" steps: - - name: Rust (Linux) - if: inputs.os == 'linux' - shell: ${{ inputs.shell }} {0} - run: | - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs/ | sh -s -- --default-toolchain=${{ inputs.rust_version }} -y - echo "$HOME/.cargo/bin" >> "$GITHUB_PATH" - - name: APT (Linux amd64/arm64) if: inputs.os == 'linux' && (inputs.cpu == 'amd64' || inputs.cpu == 'arm64') shell: ${{ inputs.shell }} {0} @@ -66,7 +56,6 @@ runs: mingw-w64-ucrt-x86_64-toolchain mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-ntldd-git - mingw-w64-ucrt-x86_64-rust - name: MSYS2 (Windows i386) if: inputs.os == 'windows' && inputs.cpu == 'i386' @@ -80,7 +69,6 @@ runs: mingw-w64-i686-toolchain mingw-w64-i686-cmake mingw-w64-i686-ntldd-git - mingw-w64-i686-rust - name: Install gcc 14 on Linux # We don't want to install gcc 14 for coverage (Ubuntu 20.04) diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index 38fb8599..0c6aec24 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -34,12 +34,6 @@ jobs: with: submodules: recursive - - name: Install Rust 1.85.0 - if: matrix.target.os != 'windows-latest' - uses: dtolnay/rust-toolchain@master - with: - toolchain: 1.85.0 - - name: MSYS2 (Windows amd64) if: matrix.target.os == 'windows-latest' && matrix.target.cpu == 'amd64' uses: msys2/setup-msys2@v2 @@ -52,7 +46,6 @@ jobs: mingw-w64-ucrt-x86_64-toolchain mingw-w64-ucrt-x86_64-cmake mingw-w64-ucrt-x86_64-ntldd-git - mingw-w64-ucrt-x86_64-rust run: | pacman -Sy --noconfirm make git config --global core.symlinks false diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4c2cbd90..d6624a43 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,9 +11,7 @@ on: env: cache_nonce: 0 # Allows for easily busting actions/cache caches nim_version: pinned - rust_version: 1.79.0 storage_binary_base: storage - cirdl_binary_base: cirdl build_dir: build nim_flags: '' windows_libs: 'libstdc++-6.dll libgomp-1.dll libgcc_s_seh-1.dll libwinpthread-1.dll' @@ -30,10 +28,10 @@ jobs: uses: fabiocaccamo/create-matrix-action@v5 with: matrix: | - os {linux}, cpu {amd64}, builder {ubuntu-22.04}, nim_version {${{ env.nim_version }}}, rust_version {${{ env.rust_version }}}, shell {bash --noprofile --norc -e -o pipefail} - os {linux}, cpu {arm64}, builder {ubuntu-22.04-arm}, nim_version {${{ env.nim_version }}}, rust_version {${{ env.rust_version }}}, shell {bash --noprofile --norc -e -o pipefail} - os {macos}, cpu {arm64}, builder {macos-14}, nim_version {${{ env.nim_version }}}, rust_version {${{ env.rust_version }}}, shell {bash --noprofile --norc -e -o pipefail} - os {windows}, cpu {amd64}, builder {windows-latest}, nim_version {${{ env.nim_version }}}, rust_version {${{ env.rust_version }}}, shell {msys2} + os {linux}, cpu {amd64}, builder {ubuntu-22.04}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} + os {linux}, cpu {arm64}, builder {ubuntu-22.04-arm}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} + os {macos}, cpu {arm64}, builder {macos-14}, nim_version {${{ env.nim_version }}}, shell {bash --noprofile --norc -e -o pipefail} + os {windows}, cpu {amd64}, builder {windows-latest}, nim_version {${{ env.nim_version }}}, shell {msys2} # Build build: @@ -63,7 +61,6 @@ jobs: cpu: ${{ matrix.cpu }} shell: ${{ matrix.shell }} nim_version: ${{ matrix.nim_version }} - rust_version: ${{ matrix.rust_version }} - name: Release - Compute binary name run: | @@ -74,18 +71,14 @@ jobs: esac github_ref_name="${GITHUB_REF_NAME/\//-}" storage_binary="${{ env.storage_binary_base }}-${github_ref_name}-${os_name}-${{ matrix.cpu }}" - cirdl_binary="${{ env.cirdl_binary_base }}-${github_ref_name}-${os_name}-${{ matrix.cpu }}" if [[ ${os_name} == "windows" ]]; then storage_binary="${storage_binary}.exe" - cirdl_binary="${cirdl_binary}.exe" fi echo "storage_binary=${storage_binary}" >>$GITHUB_ENV - echo "cirdl_binary=${cirdl_binary}" >>$GITHUB_ENV - name: Release - Build run: | make NIMFLAGS="--out:${{ env.build_dir }}/${{ env.storage_binary }} ${{ env.nim_flags }}" - make cirdl NIMFLAGS="--out:${{ env.build_dir }}/${{ env.cirdl_binary }} ${{ env.nim_flags }}" - name: Release - Libraries run: | @@ -102,14 +95,7 @@ jobs: path: ${{ env.build_dir }}/${{ env.storage_binary_base }}* retention-days: 30 - - name: Release - Upload cirdl build artifacts - uses: actions/upload-artifact@v4 - with: - name: release-${{ env.cirdl_binary }} - path: ${{ env.build_dir }}/${{ env.cirdl_binary_base }}* - retention-days: 30 - - - name: Release - Upload windows libs + - name: Release - Upload Windows libs if: matrix.os == 'windows' uses: actions/upload-artifact@v4 with: @@ -139,7 +125,7 @@ jobs: } # Compress and prepare - for file in ${{ env.storage_binary_base }}* ${{ env.cirdl_binary_base }}*; do + for file in ${{ env.storage_binary_base }}*; do if [[ "${file}" == *".exe"* ]]; then # Windows - binary only diff --git a/docker/codex.Dockerfile b/docker/codex.Dockerfile index 3c86ad6b..a7cd70dd 100644 --- a/docker/codex.Dockerfile +++ b/docker/codex.Dockerfile @@ -1,7 +1,6 @@ # Variables ARG BUILDER=ubuntu:24.04 ARG IMAGE=${BUILDER} -ARG RUST_VERSION=${RUST_VERSION:-1.79.0} ARG BUILD_HOME=/src ARG MAKE_PARALLEL=${MAKE_PARALLEL:-4} ARG NIMFLAGS="${NIMFLAGS:-"-d:disableMarchNative"}" @@ -11,24 +10,20 @@ ARG NAT_IP_AUTO=${NAT_IP_AUTO:-false} # Build FROM ${BUILDER} AS builder -ARG RUST_VERSION ARG BUILD_HOME ARG MAKE_PARALLEL ARG NIMFLAGS ARG USE_LIBBACKTRACE RUN apt-get update && apt-get install -y git cmake curl make bash lcov build-essential -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs/ | sh -s -- --default-toolchain=${RUST_VERSION} -y SHELL ["/bin/bash", "-c"] ENV BASH_ENV="/etc/bash_env" -RUN echo "export PATH=$PATH:$HOME/.cargo/bin" >> $BASH_ENV WORKDIR ${BUILD_HOME} COPY . . RUN make -j ${MAKE_PARALLEL} update RUN make -j ${MAKE_PARALLEL} -RUN make -j ${MAKE_PARALLEL} cirdl # Create FROM ${IMAGE}