From eb9470059007a0e32b2a099b4bcfbd6579b54d20 Mon Sep 17 00:00:00 2001 From: Ruoqing He Date: Thu, 27 Feb 2025 11:02:20 +0800 Subject: [PATCH] ci: Drop install-libseccomp matrix variant `install-libseccomp` is applied only for `agent` component, and we are already combining matrix with `if`s in steps, drop `install-libseccomp` in matrix to reduce complexity. Signed-off-by: Ruoqing He --- .github/workflows/build-checks-preview-riscv64.yaml | 3 +-- .github/workflows/build-checks.yaml | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-checks-preview-riscv64.yaml b/.github/workflows/build-checks-preview-riscv64.yaml index a1f3fef47e..9bba0d07eb 100644 --- a/.github/workflows/build-checks-preview-riscv64.yaml +++ b/.github/workflows/build-checks-preview-riscv64.yaml @@ -33,7 +33,6 @@ jobs: component-path: src/tools/agent-ctl - component: trace-forwarder component-path: src/tools/trace-forwarder - - install-libseccomp: no - component: genpolicy component-path: src/tools/genpolicy steps: @@ -70,7 +69,7 @@ jobs: if: ${{ matrix.command == 'make check' && matrix.component == 'agent' }} run: sudo apt-get -y install libdevmapper-dev - name: Install libseccomp - if: ${{ matrix.command != 'make vendor' && matrix.command != 'make check' && matrix.install-libseccomp == 'yes' }} + if: ${{ matrix.command != 'make vendor' && matrix.command != 'make check' && matrix.component == 'agent' }} run: | libseccomp_install_dir=$(mktemp -d -t libseccomp.XXXXXXXXXX) gperf_install_dir=$(mktemp -d -t gperf.XXXXXXXXXX) diff --git a/.github/workflows/build-checks.yaml b/.github/workflows/build-checks.yaml index 0ff280b6a7..a9243ec223 100644 --- a/.github/workflows/build-checks.yaml +++ b/.github/workflows/build-checks.yaml @@ -41,9 +41,6 @@ jobs: component-path: src/tools/kata-ctl - component: trace-forwarder component-path: src/tools/trace-forwarder - - install-libseccomp: no - - component: agent - install-libseccomp: yes - component: genpolicy component-path: src/tools/genpolicy steps: @@ -80,7 +77,7 @@ jobs: if: ${{ matrix.command == 'make check' && matrix.component == 'agent' }} run: sudo apt-get -y install libdevmapper-dev - name: Install libseccomp - if: ${{ matrix.command != 'make vendor' && matrix.command != 'make check' && matrix.install-libseccomp == 'yes' }} + if: ${{ matrix.command != 'make vendor' && matrix.command != 'make check' && matrix.component == 'agent' }} run: | libseccomp_install_dir=$(mktemp -d -t libseccomp.XXXXXXXXXX) gperf_install_dir=$(mktemp -d -t gperf.XXXXXXXXXX)