Simplify build-ami to reuse existing actions

Signed-off-by: Claude <[email protected]>

Author: joseph-isaacs

.github/actions/build-ami/action.yml

@@ -17,18 +17,6 @@ inputs:
     description: "Number of days before AMI is deprecated"
     required: false
     default: "30"
-  rust-toolchain:
-    description: "Rust toolchain version (reads from rust-toolchain.toml if empty)"
-    required: false
-    default: ""
-  protoc-version:
-    description: "Protocol Buffers compiler version"
-    required: false
-    default: "29.3"
-  flatc-version:
-    description: "FlatBuffers compiler version"
-    required: false
-    default: "25.9.23"
 
 outputs:
   ami-id:
@@ -41,126 +29,36 @@ outputs:
 runs:
   using: "composite"
   steps:
-    - name: Resolve Rust Toolchain
-      id: toolchain
-      shell: bash
-      run: |
-        if [ -n "${{ inputs.rust-toolchain }}" ]; then
-          echo "version=${{ inputs.rust-toolchain }}" >> $GITHUB_OUTPUT
-        elif [ -f rust-toolchain.toml ]; then
-          VERSION=$(grep channel rust-toolchain.toml | awk -F'"' '{print $2}')
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-        else
-          echo "version=stable" >> $GITHUB_OUTPUT
-        fi
+    - name: Setup Rust
+      uses: ./.github/actions/setup-rust
+
+    - name: Setup flatc
+      uses: ./.github/actions/setup-flatc
 
-    - name: Install dependencies
+    - name: Install extra dependencies
       shell: bash
       run: |
         sudo apt-get update
         sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-          build-essential \
-          curl \
-          git \
-          ca-certificates \
-          pkg-config \
-          libssl-dev \
           cmake \
           ninja-build \
           clang \
           lld \
-          llvm \
-          jq \
-          unzip \
-          zip \
-          zstd \
-          python3 \
-          python3-pip \
-          python3-venv \
-          libicu74 \
-          libkrb5-3 \
-          zlib1g \
-          libcurl4-openssl-dev
+          llvm
 
-    - name: Install mold linker
+    - name: Install nightly toolchain
       shell: bash
       run: |
-        MOLD_VERSION=$(curl -s https://api.github.com/repos/rui314/mold/releases/latest | jq -r .tag_name | sed 's/v//')
-        ARCH=$(uname -m)
-        curl -fsSL "https://github.com/rui314/mold/releases/download/v${MOLD_VERSION}/mold-${MOLD_VERSION}-${ARCH}-linux.tar.gz" \
-          | sudo tar -xz -C /usr/local --strip-components=1
-        mold --version
-
-    - name: Install Rust
-      shell: bash
-      env:
-        RUST_TOOLCHAIN: ${{ steps.toolchain.outputs.version }}
-      run: |
-        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain "$RUST_TOOLCHAIN"
-        source "$HOME/.cargo/env"
-        rustup component add clippy rustfmt
         rustup toolchain install nightly
         rustup component add --toolchain nightly rustfmt clippy rust-src miri llvm-tools-preview
-        cargo --version
-        rustc --version
-
-    - name: Install protoc
-      shell: bash
-      env:
-        PROTOC_VERSION: ${{ inputs.protoc-version }}
-      run: |
-        ARCH=$(uname -m)
-        if [ "$ARCH" = "x86_64" ]; then PROTOC_ARCH=linux-x86_64; else PROTOC_ARCH=linux-aarch_64; fi
-        curl -fsSL -o /tmp/protoc.zip "https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-${PROTOC_ARCH}.zip"
-        sudo unzip -o /tmp/protoc.zip -d /usr/local bin/protoc 'include/*'
-        sudo chmod +x /usr/local/bin/protoc
-        rm /tmp/protoc.zip
-        protoc --version
-
-    - name: Install flatc
-      shell: bash
-      env:
-        FLATC_VERSION: ${{ inputs.flatc-version }}
-      run: |
-        ARCH=$(uname -m)
-        if [ "$ARCH" = "x86_64" ]; then
-          curl -fsSL -o /tmp/flatc.zip "https://github.com/nicholasguan/flatbuffers/releases/download/v${FLATC_VERSION}/Linux.flatc.binary.clang++-18.zip"
-          sudo unzip -o /tmp/flatc.zip -d /usr/local/bin
-          sudo chmod +x /usr/local/bin/flatc
-          rm /tmp/flatc.zip
-        else
-          git clone --depth 1 --branch "v${FLATC_VERSION}" https://github.com/google/flatbuffers.git /tmp/flatbuffers
-          cd /tmp/flatbuffers && cmake -G Ninja -DCMAKE_BUILD_TYPE=Release && ninja
-          sudo cp flatc /usr/local/bin/
-          rm -rf /tmp/flatbuffers
-        fi
-        flatc --version
-
-    - name: Install sccache
-      shell: bash
-      run: |
-        SCCACHE_VERSION=$(curl -s https://api.github.com/repos/mozilla/sccache/releases/latest | jq -r .tag_name | sed 's/v//')
-        ARCH=$(uname -m)
-        if [ "$ARCH" = "x86_64" ]; then SCCACHE_ARCH=x86_64-unknown-linux-musl; else SCCACHE_ARCH=aarch64-unknown-linux-musl; fi
-        curl -fsSL "https://github.com/mozilla/sccache/releases/download/v${SCCACHE_VERSION}/sccache-v${SCCACHE_VERSION}-${SCCACHE_ARCH}.tar.gz" \
-          | sudo tar -xz -C /usr/local/bin --strip-components=1 "sccache-v${SCCACHE_VERSION}-${SCCACHE_ARCH}/sccache"
-        sudo chmod +x /usr/local/bin/sccache
-        sccache --version
 
     - name: Install cargo tools
       shell: bash
       run: |
-        source "$HOME/.cargo/env"
         cargo install cargo-nextest --locked
         cargo install cargo-hack --locked
         cargo install grcov --locked
 
-    - name: Setup environment
-      shell: bash
-      run: |
-        echo 'source $HOME/.cargo/env' >> "$HOME/.bashrc"
-        echo 'export PATH=$HOME/.cargo/bin:/usr/local/bin:$PATH' >> "$HOME/.bashrc"
-
     - name: Get instance ID
       id: instance
       shell: bash