From b4e0196b61060178dd2950ea71da5a96d77ce614 Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Wed, 18 Dec 2024 13:19:12 +0100 Subject: [PATCH] cleanup(ci): drop unused deps. Signed-off-by: Federico Di Pierro --- .github/actions/composite-perf/action.yml | 2 +- .github/workflows/ci.yml | 9 +++------ .github/workflows/drivers_ci.yml | 2 +- .github/workflows/e2e_ci.yml | 5 +---- .github/workflows/test_coverage_ci.yml | 2 +- test/e2e/containers/sinsp.Dockerfile | 3 --- test/vm/containers/ubuntu2004.Dockerfile | 6 ------ test/vm/containers/ubuntu2204.Dockerfile | 6 ------ test/vm/containers/ubuntu2404.Dockerfile | 5 ----- 9 files changed, 7 insertions(+), 33 deletions(-) diff --git a/.github/actions/composite-perf/action.yml b/.github/actions/composite-perf/action.yml index 61c202cc49..7fababf248 100644 --- a/.github/actions/composite-perf/action.yml +++ b/.github/actions/composite-perf/action.yml @@ -24,7 +24,7 @@ runs: - name: Install deps ⛓️ shell: bash run: | - sudo apt update && sudo apt install -y --no-install-recommends ca-certificates cmake build-essential git clang llvm pkg-config autoconf automake libtool libelf-dev wget libc-ares-dev libssl-dev libtbb-dev libjq-dev libjsoncpp-dev libgrpc++-dev protobuf-compiler-grpc libgtest-dev libprotobuf-dev linux-tools-common linux-tools-generic linux-tools-`uname -r` heaptrack coreutils util-linux + sudo apt update && sudo apt install -y --no-install-recommends ca-certificates cmake build-essential git clang llvm pkg-config autoconf automake libtool libelf-dev wget libtbb-dev libjq-dev libjsoncpp-dev protobuf-compiler libgtest-dev libprotobuf-dev linux-tools-common linux-tools-generic linux-tools-`uname -r` heaptrack coreutils util-linux sudo .github/install-deps.sh - name: Build diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 82cc5f0bb8..e72c4c9213 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,7 +36,7 @@ jobs: steps: - name: Install deps ⛓️ run: | - apt update && apt install -y --no-install-recommends curl ca-certificates build-essential git clang llvm pkg-config autoconf automake libtool libelf-dev wget libc-ares-dev libssl-dev libtbb-dev libjq-dev libjsoncpp-dev libgrpc++-dev protobuf-compiler-grpc libgtest-dev libprotobuf-dev linux-headers-${{ matrix.arch }} + apt update && apt install -y --no-install-recommends curl ca-certificates build-essential git clang llvm pkg-config autoconf automake libtool libelf-dev wget libtbb-dev libjq-dev libjsoncpp-dev protobuf-compiler libgtest-dev libprotobuf-dev linux-headers-${{ matrix.arch }} - name: Install a recent version of CMake ⛓️ run: | @@ -126,7 +126,7 @@ jobs: - name: Install deps ⛓️ run: | sudo apt update - sudo apt install -y --no-install-recommends ca-certificates cmake build-essential git clang llvm pkg-config autoconf automake libtool libelf-dev wget libc-ares-dev libssl-dev libre2-dev libtbb-dev libjq-dev libjsoncpp-dev libgrpc++-dev protobuf-compiler-grpc libgtest-dev libprotobuf-dev linux-headers-$(uname -r) + sudo apt install -y --no-install-recommends ca-certificates cmake build-essential git clang llvm pkg-config autoconf automake libtool libelf-dev wget libre2-dev libtbb-dev libjq-dev libjsoncpp-dev protobuf-compiler libgtest-dev libprotobuf-dev linux-headers-$(uname -r) sudo .github/install-deps.sh - name: Build and test 🏗️🧪 @@ -279,17 +279,14 @@ jobs: libtool \ libelf-dev \ wget \ - libc-ares-dev \ libbpf-dev \ libcap-dev \ - libssl-dev \ libtbb-dev \ libjq-dev \ libjsoncpp-dev \ - libgrpc++-dev \ - protobuf-compiler-grpc \ libgtest-dev \ libprotobuf-dev \ + protobuf-compiler \ "linux-headers-$(uname -r)" sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 90 sudo update-alternatives --install /usr/bin/llvm-strip llvm-strip /usr/bin/llvm-strip-14 90 diff --git a/.github/workflows/drivers_ci.yml b/.github/workflows/drivers_ci.yml index 53f11ea0a9..e4138808ef 100644 --- a/.github/workflows/drivers_ci.yml +++ b/.github/workflows/drivers_ci.yml @@ -213,7 +213,7 @@ jobs: githubToken: ${{ github.token }} install: | - apt update && apt install -y --no-install-recommends ca-certificates cmake build-essential clang llvm git pkg-config autoconf automake libtool libelf-dev wget libc-ares-dev libssl-dev libtbb-dev libjq-dev libjsoncpp-dev libgrpc++-dev protobuf-compiler-grpc libcap-dev libgtest-dev libprotobuf-dev linux-headers-generic + apt update && apt install -y --no-install-recommends ca-certificates cmake build-essential clang llvm git pkg-config autoconf automake libtool libelf-dev wget libtbb-dev libjq-dev libjsoncpp-dev libcap-dev protobuf-compiler libgtest-dev libprotobuf-dev linux-headers-generic git clone https://github.com/libbpf/bpftool.git --branch v7.3.0 --single-branch cd bpftool git submodule update --init diff --git a/.github/workflows/e2e_ci.yml b/.github/workflows/e2e_ci.yml index cf2cbd6255..8a5fd040da 100644 --- a/.github/workflows/e2e_ci.yml +++ b/.github/workflows/e2e_ci.yml @@ -44,17 +44,14 @@ jobs: libtool \ libelf-dev \ wget \ - libc-ares-dev \ libbpf-dev \ libcap-dev \ - libssl-dev \ libtbb-dev \ libjq-dev \ libjsoncpp-dev \ - libgrpc++-dev \ - protobuf-compiler-grpc \ libgtest-dev \ libprotobuf-dev \ + protobuf-compiler \ linux-headers-$(uname -r) sudo .github/install-deps.sh git clone https://github.com/libbpf/bpftool.git --branch v7.3.0 --single-branch diff --git a/.github/workflows/test_coverage_ci.yml b/.github/workflows/test_coverage_ci.yml index b75a613897..890d7cfebf 100644 --- a/.github/workflows/test_coverage_ci.yml +++ b/.github/workflows/test_coverage_ci.yml @@ -22,7 +22,7 @@ jobs: - name: Install deps ⛓️ run: | - sudo apt install -y --no-install-recommends ca-certificates cmake build-essential git clang llvm pkg-config autoconf automake libtool libelf-dev wget libc-ares-dev libcurl4-openssl-dev libssl-dev libre2-dev libtbb-dev libjq-dev libjsoncpp-dev libgrpc++-dev protobuf-compiler-grpc libgtest-dev libprotobuf-dev linux-headers-$(uname -r) gpg gpg-agent gcovr + sudo apt install -y --no-install-recommends ca-certificates cmake build-essential git clang llvm pkg-config autoconf automake libtool libelf-dev wget libre2-dev libtbb-dev libjq-dev libjsoncpp-dev protobuf-compiler libgtest-dev libprotobuf-dev linux-headers-$(uname -r) gpg gpg-agent gcovr sudo .github/install-deps.sh - name: Build and test 🏗️🧪 diff --git a/test/e2e/containers/sinsp.Dockerfile b/test/e2e/containers/sinsp.Dockerfile index 497bed228f..c87ee6586d 100644 --- a/test/e2e/containers/sinsp.Dockerfile +++ b/test/e2e/containers/sinsp.Dockerfile @@ -4,11 +4,8 @@ ENV HOST_ROOT /host RUN apt-get update && \ apt-get install -y \ - libcurl4 \ - libgrpc++1 \ jq \ libjsoncpp1 \ - openssl \ libre2-5 \ libtbb2 diff --git a/test/vm/containers/ubuntu2004.Dockerfile b/test/vm/containers/ubuntu2004.Dockerfile index 8c66c293a7..11e148c5b1 100755 --- a/test/vm/containers/ubuntu2004.Dockerfile +++ b/test/vm/containers/ubuntu2004.Dockerfile @@ -8,7 +8,6 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update -y RUN apt --fix-broken -y install && apt-get install -y --no-install-recommends \ build-essential \ - libssl-dev \ zlib1g-dev \ libbz2-dev \ libreadline-dev \ @@ -30,13 +29,8 @@ RUN apt --fix-broken -y install && apt-get install -y --no-install-recommends \ autoconf \ libtool \ libelf-dev \ - libssl-dev \ - libc-ares-dev \ libprotobuf-dev \ protobuf-compiler \ - libgrpc++-dev \ - protobuf-compiler-grpc \ - libcurl4-openssl-dev \ libyaml-cpp-dev \ cmake \ rpm \ diff --git a/test/vm/containers/ubuntu2204.Dockerfile b/test/vm/containers/ubuntu2204.Dockerfile index f20436d2c0..a6972f30e9 100755 --- a/test/vm/containers/ubuntu2204.Dockerfile +++ b/test/vm/containers/ubuntu2204.Dockerfile @@ -9,7 +9,6 @@ ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update -y RUN apt --fix-broken -y install && apt-get install -y --no-install-recommends \ build-essential \ - libssl-dev \ zlib1g-dev \ libbz2-dev \ libreadline-dev \ @@ -31,13 +30,8 @@ RUN apt --fix-broken -y install && apt-get install -y --no-install-recommends \ autoconf \ libtool \ libelf-dev \ - libssl-dev \ - libc-ares-dev \ libprotobuf-dev \ protobuf-compiler \ - libgrpc++-dev \ - protobuf-compiler-grpc \ - libcurl4-openssl-dev \ libyaml-cpp-dev \ cmake \ rpm \ diff --git a/test/vm/containers/ubuntu2404.Dockerfile b/test/vm/containers/ubuntu2404.Dockerfile index 5e233b08c6..fd038543d5 100644 --- a/test/vm/containers/ubuntu2404.Dockerfile +++ b/test/vm/containers/ubuntu2404.Dockerfile @@ -29,13 +29,8 @@ RUN apt --fix-broken -y install && apt-get install -y \ autoconf \ libtool \ libelf-dev \ - libssl-dev \ - libc-ares-dev \ libprotobuf-dev \ protobuf-compiler \ - libgrpc++-dev \ - protobuf-compiler-grpc \ - libcurl4-openssl-dev \ libyaml-cpp-dev \ cmake \ rpm \