From 3eea82238b374dff0c7b7907700f1dbadaca3c80 Mon Sep 17 00:00:00 2001 From: Roberto Scolaro Date: Fri, 27 Oct 2023 15:28:11 +0200 Subject: [PATCH] wip Signed-off-by: Roberto Scolaro --- .github/workflows/reusable_build_dev.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/reusable_build_dev.yaml b/.github/workflows/reusable_build_dev.yaml index fbc4e75c889..c2b67ca3774 100644 --- a/.github/workflows/reusable_build_dev.yaml +++ b/.github/workflows/reusable_build_dev.yaml @@ -36,12 +36,12 @@ on: jobs: build-and-test: # See https://github.com/actions/runner/issues/409#issuecomment-1158849936 - runs-on: ${{ (inputs.arch == 'aarch64' && fromJSON('[ "self-hosted", "linux", "ARM64" ]')) || '${{matrix.operating-systems}}' }} + runs-on: ${{ (inputs.arch == 'aarch64' && fromJSON('[ "self-hosted", "linux", "ARM64" ]')) || matrix.os }} container: ${{ (inputs.arch == 'aarch64' && 'ubuntu:22.04') || '' }} strategy: fail-fast: false matrix: - operating-systems: ${{fromJson(inputs.operating-systems)}} + os: ${{fromJson(inputs.operating-systems)}} outputs: cmdout: ${{ steps.run_cmd.outputs.out }} steps: @@ -52,15 +52,15 @@ jobs: ref: ${{ inputs.git_ref }} - name: Update base image - if: matrix.operating-systems == 'ubuntu:22.04' + if: matrix.os == 'ubuntu-22.04' run: sudo apt update -y - name: Install build dependencies - if: matrix.operating-systems == 'ubuntu:22.04' + if: matrix.os == 'ubuntu-22.04' run: sudo DEBIAN_FRONTEND=noninteractive apt install libjq-dev libelf-dev libyaml-cpp-dev cmake build-essential git -y - name: Install build dependencies (non-minimal) - if: inputs.minimal != true && matrix.operating-systems == 'ubuntu:22.04' + if: inputs.minimal != true && matrix.os == 'ubuntu-22.04' run: sudo DEBIAN_FRONTEND=noninteractive apt install libssl-dev libyaml-dev libc-ares-dev libprotobuf-dev protobuf-compiler libgrpc++-dev protobuf-compiler-grpc rpm libcurl4-openssl-dev linux-headers-$(uname -r) clang llvm -y - name: Prepare project @@ -73,6 +73,7 @@ jobs: -DBUILD_BPF=${{ inputs.minimal == true && 'OFF' || 'ON' }} \ -DBUILD_DRIVER=${{ inputs.minimal == true && 'OFF' || 'ON' }} \ -DMINIMAL_BUILD=${{ inputs.minimal == true && 'ON' || 'OFF' }} \ + -DUSE_BUNDLED_DEPS=${{ matrix.os == 'ubunut-22.04' && 'OFF' || 'ON' }} \ .. popd