From c36308954de82a40604f8f5423eaa840155c9d64 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Tue, 8 Apr 2025 03:46:04 +0200 Subject: [PATCH 1/2] CI: Drop about-to-be-removed Ubuntu 20.04 CI --- .github/workflows/cmake-multi-platform.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 4d66b65..382f197 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -40,16 +40,6 @@ jobs: c_compiler: clang cpp_compiler: clang++ bundled_protobuf: 'OFF' - - os: ubuntu-20.04 - build_type: Release - c_compiler: clang-12 - cpp_compiler: clang++-12 - bundled_protobuf: 'OFF' - - os: ubuntu-20.04 - build_type: Debug - c_compiler: clang-12 - cpp_compiler: clang++-12 - bundled_protobuf: 'OFF' steps: - uses: actions/checkout@v3 From 17fd6f5b74cb45d733e3c6d0feb2499079c2d4df Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Tue, 8 Apr 2025 03:49:51 +0200 Subject: [PATCH 2/2] CI: Add missing "sudo apt-get update" Also add --no-install-recommends (to install as few as possible additional packages) packages and use apt-get rather than apt because the target is a machine (rather thamn a human). --- .github/workflows/cmake-multi-platform.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 382f197..ab89c2c 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -57,7 +57,8 @@ jobs: ) fi set -x - sudo apt install -y "${ubuntu_packages[@]}" + sudo apt-get update + sudo apt-get install --no-install-recommends -y "${ubuntu_packages[@]}" - name: Set reusable strings # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.