From 635f680dd5f180efb20a8676a9b23984e3262f64 Mon Sep 17 00:00:00 2001
From: Jason Hall <jason@chainguard.dev>
Date: Sun, 8 Jun 2025 20:47:20 -0400
Subject: [PATCH] fix: update CI cross-compilation config and remove local
 config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Move cross-compilation setup to CI workflow for better portability
- Remove local .cargo/config.toml to avoid conflicts
- Add cross-compilation config directly in CI test matrix
- Re-enable make run-built-image in main test job

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
---
 .github/workflows/ci.yml | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4b8ab7a..3c92719 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,25 +43,6 @@ jobs:
         path: target
         key: ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
 
-    - run: make verify-cross-compile
-    - run: make build
-    - run: make test
-    - run: make test-e2e
-    #- run: make run-built-image
-
-  integration:
-    name: Integration Test
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-    - uses: dtolnay/rust-toolchain@b3b07ba8b418998c39fb20f53e8b695cdcc8de1b # master
-      with:
-        toolchain: stable
-        targets: x86_64-unknown-linux-musl,aarch64-unknown-linux-musl
-    - name: Install cross-compilation tools
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y musl-tools gcc-aarch64-linux-gnu
     - name: Setup cargo config for CI cross-compilation
       run: |
         mkdir -p .cargo
@@ -72,8 +53,11 @@ jobs:
         [target.aarch64-unknown-linux-musl]
         linker = "aarch64-linux-gnu-gcc"
         EOF
+
     - run: make verify-cross-compile
     - run: make build
+    - run: make test
+    - run: make test-e2e
     - run: make run-built-image
 
   fmt: