From d92fc95c39773f08d8dbf95c21cd8c6d11bafa03 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Wed, 27 Nov 2024 10:57:44 -0500
Subject: [PATCH] ci: remove cross toolchain

We aren't actually building for these targets, we only use this to pick
the set of generated definitions to use in BPF which is the true target.
---
 .github/workflows/ci.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 05778c2c..ae445709 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -74,7 +74,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch:
+        bpf_target_arch:
           - x86_64-unknown-linux-gnu
           - aarch64-unknown-linux-gnu
           - armv7-unknown-linux-gnueabi
@@ -88,16 +88,11 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: stable
-          targets: ${{ matrix.arch }}
 
       - uses: Swatinem/rust-cache@v2
 
       - uses: taiki-e/install-action@cargo-hack
 
-      - uses: taiki-e/setup-cross-toolchain-action@v1
-        with:
-          target: ${{ matrix.arch }}
-
       - name: Build
         run: |
           set -euxo pipefail
@@ -139,7 +134,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch:
+        bpf_target_arch:
           - x86_64
           - aarch64
           - arm
@@ -167,7 +162,7 @@ jobs:
       - uses: taiki-e/install-action@cargo-hack
       - name: Build
         env:
-          CARGO_CFG_BPF_TARGET_ARCH: ${{ matrix.arch }}
+          CARGO_CFG_BPF_TARGET_ARCH: ${{ matrix.bpf_target_arch }}
         run: |
           set -euxo pipefail
           cargo hack build --package aya-ebpf --package aya-log-ebpf \
@@ -177,7 +172,7 @@ jobs:
 
       - name: Test
         env:
-          CARGO_CFG_BPF_TARGET_ARCH: ${{ matrix.arch }}
+          CARGO_CFG_BPF_TARGET_ARCH: ${{ matrix.bpf_target_arch }}
           RUST_BACKTRACE: full
         run: |
           set -euxo pipefail