From bc195d758afdd5837942d6c6e5848f1162ceb48d Mon Sep 17 00:00:00 2001 From: Sumedh Alok Sharma Date: Wed, 9 Oct 2024 14:05:14 +0530 Subject: [PATCH] ci: Install build dependencies for building agent-ctl with image pull. Adds dependencies of 'clang' & 'protobuf' to be installed in runners when building agent-ctl sources having image pull support. Fixes #10400 Signed-off-by: Sumedh Alok Sharma --- .github/workflows/build-checks.yaml | 4 ++-- tools/packaging/static-build/tools/Dockerfile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-checks.yaml b/.github/workflows/build-checks.yaml index c8ece791c4..8a720b758a 100644 --- a/.github/workflows/build-checks.yaml +++ b/.github/workflows/build-checks.yaml @@ -94,10 +94,10 @@ jobs: echo "LIBSECCOMP_LINK_TYPE=static" >> $GITHUB_ENV echo "LIBSECCOMP_LIB_PATH=${libseccomp_install_dir}/lib" >> $GITHUB_ENV - name: Install protobuf-compiler - if: ${{ matrix.command != 'make vendor' && (matrix.component == 'agent' || matrix.component == 'runk' || matrix.component == 'genpolicy') }} + if: ${{ matrix.command != 'make vendor' && (matrix.component == 'agent' || matrix.component == 'runk' || matrix.component == 'genpolicy' || matrix.component == 'agent-ctl') }} run: sudo apt-get -y install protobuf-compiler - name: Install clang - if: ${{ matrix.command == 'make check' && matrix.component == 'agent' }} + if: ${{ matrix.command == 'make check' && (matrix.component == 'agent' || matrix.component == 'agent-ctl') }} run: sudo apt-get -y install clang - name: Setup XDG_RUNTIME_DIR for the `runtime` tests if: ${{ matrix.command != 'make vendor' && matrix.command != 'make check' && matrix.component == 'runtime' }} diff --git a/tools/packaging/static-build/tools/Dockerfile b/tools/packaging/static-build/tools/Dockerfile index cc87360ed6..e49c7fe409 100644 --- a/tools/packaging/static-build/tools/Dockerfile +++ b/tools/packaging/static-build/tools/Dockerfile @@ -20,6 +20,7 @@ RUN mkdir ${RUSTUP_HOME} ${CARGO_HOME} && chmod -R a+rwX ${RUSTUP_HOME} ${CARGO_ RUN apk --no-cache add \ bash \ + clang \ cmake \ curl \ gcc \