Skip to content

Commit

Permalink
fix(ci): correctly handle job matrix
Browse files Browse the repository at this point in the history
Signed-off-by: Roberto Scolaro <roberto.scolaro21@gmail.com>
  • Loading branch information
therealbobo committed Feb 7, 2024
1 parent 28c7cde commit a242e36
Showing 1 changed file with 6 additions and 18 deletions.
24 changes: 6 additions & 18 deletions .github/workflows/e2e_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@ jobs:
strategy:
matrix:
arch: [amd64, arm64]
include:
- name: kmod
option: -k
- name: bpf
option: -b
- name: modern-bpf
option: -m
driver: [ {name: kmod, option: -k}, {name: bpf, option: -b}, {name: modern-bpf, option: -m} ]
fail-fast: false
steps:
- name: Checkout Libs ⤵️
Expand Down Expand Up @@ -61,24 +55,18 @@ jobs:
cd build && cmake -DUSE_BUNDLED_DEPS=ON -DENABLE_LIBSINSP_TESTS=ON -DBUILD_LIBSCAP_MODERN_BPF=ON -DBUILD_BPF=ON -DBUILD_LIBSCAP_GVISOR=OFF ../
make -j6
- name: Run e2e tests with ${{ matrix.name }} 🏎️
- name: Run e2e tests with ${{ matrix.driver.name }} 🏎️
run: |
cd build/test/libsinsp/
sudo ./libsinsp_e2e_tests ${{ matrix.option }}
sudo ./libsinsp_e2e_tests ${{ matrix.driver.option }}
build-drivers-s390x-ppc64le:
name: build-drivers-${{ matrix.arch }} 😁 (system_deps)
runs-on: ubuntu-22.04
strategy:
matrix:
arch: [s390x, ppc64le]
include:
- name: kmod
option: -k
- name: bpf
option: -b
- name: modern-bpf
option: -m
driver: [ {name: kmod, option: -k}, {name: bpf, option: -b}, {name: modern-bpf, option: -m} ]
fail-fast: false
env:
PLATFORM: ${{ matrix.arch == 'ppc64le' && 'powerpc64le' || 's390x' }}
Expand Down Expand Up @@ -113,7 +101,7 @@ jobs:
cd build && cmake -DBUILD_BPF=ON -DUSE_BUNDLED_DEPS=OFF -DMODERN_PROBE_INCLUDE="-I/usr/include/${{env.PLATFORM}}-linux-gnu" -DBUILD_LIBSCAP_MODERN_BPF=ON -DENABLE_LIBSINSP_TESTS=ON -DBUILD_LIBSCAP_GVISOR=OFF ../
KERNELDIR=/lib/modules/$(ls /lib/modules)/build make -j6
- name: Run e2e tests with ${{ matrix.name }} 🏎️
- name: Run e2e tests with ${{ matrix.driver.name }} 🏎️
run: |
cd build/test/libsinsp/
sudo ./libsinsp_e2e_tests ${{ matrix.option }}
sudo ./libsinsp_e2e_tests ${{ matrix.driver.option }}

0 comments on commit a242e36

Please sign in to comment.