Jelajahi Sumber

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.
Tamir Duberstein 6 bulan lalu
induk
melakukan
d92fc95c39
1 mengubah file dengan 4 tambahan dan 9 penghapusan
  1. 4 9
      .github/workflows/ci.yml

+ 4 - 9
.github/workflows/ci.yml

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