Revert "chore: install clang20, upgrade wasi-sdk to 27 (#16414)"

This reverts commit 15d3b08.

Author: johnathan79717

bootstrap.sh

@@ -73,11 +73,11 @@ function check_toolchains {
     echo -e "${bold}${yellow}WARN: Rust ${rust_version} is not installed. Performance will be degraded.${reset}"
   fi
   # Check wasi-sdk version.
-  if ! cat /opt/wasi-sdk/VERSION 2> /dev/null | grep 27.0 > /dev/null; then
+  if ! cat /opt/wasi-sdk/VERSION 2> /dev/null | grep 22.0 > /dev/null; then
     encourage_dev_container
-    echo "wasi-sdk-27 not found at /opt/wasi-sdk."
+    echo "wasi-sdk-22 not found at /opt/wasi-sdk."
     echo "Use dev container, build from source, or you can install linux x86 version with:"
-    echo "  curl -s -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sdk-27.0-x86_64-linux.tar.gz | tar zxf - && sudo mv wasi-sdk-27.0-x86_64-linux /opt/wasi-sdk"
+    echo "  curl -s -L https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-22/wasi-sdk-22.0-linux.tar.gz | tar zxf - && sudo mv wasi-sdk-22.0 /opt/wasi-sdk"
     exit 1
   fi
   # Check foundry version.

build-images/bootstrap.sh

@@ -61,8 +61,8 @@ function build_ec2 {
     git remote add origin https://github.com/aztecprotocol/aztec-packages
     git fetch --depth 1 origin $current_commit
     git checkout FETCH_HEAD
-    ./build-images/bootstrap.sh
-    ./build-images/bootstrap.sh push-images
+    ./build-images/bootstrap.sh || bash
+    ./build-images/bootstrap.sh push-images || bash
   "
 }
 

build-images/src/Dockerfile

@@ -21,14 +21,23 @@ RUN export DEBIAN_FRONTEND="noninteractive" \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Install rust and cross-compilers. Noir specifically uses 1.85.0.
-# We give everyone write ownership so downstream boxes can write.
-ENV RUSTUP_HOME=/opt/rust/rustup
-ENV CARGO_HOME=/opt/rust/cargo
-ENV PATH="/opt/rust/cargo/bin:$PATH"
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.85.0 && \
-    rustup target add wasm32-unknown-unknown wasm32-wasip1 aarch64-apple-darwin && \
-    chmod -R a+w /opt/rust
+
+########################################################################################################################
+# Build wasi-sdk.
+FROM base-build AS wasi-sdk
+RUN apt update && apt install cargo -y
+RUN git clone --depth 1 --recursive --branch wasi-sdk-22 https://github.com/WebAssembly/wasi-sdk.git \
+    && mkdir -p /wasi-sdk/build/install/opt/wasi-sdk \
+    && cd /wasi-sdk \
+    && export MAKEFLAGS="-j$(nproc)" \
+    && make build/llvm.BUILT \
+    && make build/wasi-libc.BUILT \
+    && make build/compiler-rt.BUILT \
+    && make build/libcxx.BUILT \
+    && make build/config.BUILT \
+    && make build/version.BUILT \
+    && mv build/install/opt/wasi-sdk /opt/wasi-sdk \
+    && cd / && rm -rf /wasi-sdk
 
 
 ########################################################################################################################
@@ -72,6 +81,7 @@ ENV RUSTUP_HOME=/opt/rust/rustup
 ENV CARGO_HOME=/opt/rust/cargo
 ENV PATH="/opt/rust/cargo/bin:$PATH"
 ENV RUSTFLAGS="-C target-cpu=generic"
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 RUN curl -L https://foundry.paradigm.xyz | bash \
     && $FOUNDRY_BIN_DIR/foundryup -i $FOUNDRY_VERSION \
     && mkdir -p /opt/foundry/bin \
@@ -93,7 +103,7 @@ RUN curl -L https://foundry.paradigm.xyz | bash \
 # We use this image for test isolation.
 FROM base-build AS build
 
-# APT repo for node (22.16.0)
+# APT repo for node (22.15.0)
 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
 ENV NODE_MAJOR=22
 RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
@@ -114,22 +124,22 @@ RUN apt update && \
         lsof \
         xxd \
         zstd \
-        # C++
-        lsb-release \
-        gnupg \
-        software-properties-common \
+        # C++ (clang=18, which we will move to. 16 is for current build.)
         build-essential \
+        cmake \
+        ninja-build \
         clang \
         clang-16 \
         clang-format-16 \
-        cmake \
-        ninja-build \
         libc++-dev \
         libomp-dev \
+        clang-18 \
+        clang-format-18 \
+        libc++-18-dev \
+        libomp-18-dev \
+        libclang-rt-18-dev \
         doxygen \
-        # Node
-        # WARNING: Need to downgrade to this version in the basebox below as well.
-        nodejs=22.16.0-1nodesource1 \
+        nodejs \
         # Python (clang bindings for wasm bindgen.)
         python3 \
         python3-clang \
@@ -139,23 +149,22 @@ RUN apt update && \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Install clang 18/20.
-RUN wget https://apt.llvm.org/llvm.sh && \
-    chmod +x llvm.sh && \
-    ./llvm.sh 18 all && \
-    ./llvm.sh 20 all && \
-    rm llvm.sh
-
 # Install wasi-sdk.
-RUN wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-27/wasi-sdk-27.0-x86_64-linux.tar.gz && \
-    tar xvf wasi-sdk-27.0-x86_64-linux.tar.gz && \
-    mv wasi-sdk-27.0-x86_64-linux /opt/wasi-sdk && \
-    rm wasi-sdk-27.0-x86_64-linux.tar.gz
+COPY --from=wasi-sdk /opt/wasi-sdk /opt/wasi-sdk
 
 # Install foundry.
 COPY --from=foundry /opt/foundry /opt/foundry
 ENV PATH="/opt/foundry/bin:$PATH"
 
+# Install rust and cross-compilers. Noir specifically uses 1.85.0.
+# We give everyone write ownership so downstream boxes can write.
+ENV RUSTUP_HOME=/opt/rust/rustup
+ENV CARGO_HOME=/opt/rust/cargo
+ENV PATH="/opt/rust/cargo/bin:$PATH"
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.85.0 && \
+    rustup target add wasm32-unknown-unknown wasm32-wasip1 aarch64-apple-darwin && \
+    chmod -R a+w /opt/rust
+
 # Install corepack and yarn.
 RUN npm install --global corepack && corepack enable && corepack install --global [email protected]
 
@@ -202,7 +211,7 @@ RUN yes | unminimize
 
 # Install stuff devs need.
 RUN apt update && \
-    apt install -y --allow-downgrades \
+    apt install -y \
         cgroup-tools \
         clangd-16 \
         clangd-18 \
@@ -231,8 +240,6 @@ RUN apt update && \
         vim \
         zsh \
         inotify-tools \
-        # Annoyingly unminimize upgrades nodejs.
-        nodejs=22.16.0-1nodesource1 \
     && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # Install osxcross. Requires developer to mount SDK from their mac host.

ci3/aws/ami_id_amd64

@@ -1 +1 @@
-ami-01c2ab656d55fe60a
+ami-0d32666897f9356ec

ci3/aws/ami_id_arm64

@@ -1 +1 @@
-ami-056bc8eabcf0de893
+ami-04865b68b1f59d324