From cda1fe549441ed1dda738bb00469da76f5c48e00 Mon Sep 17 00:00:00 2001 From: Hans Kristian Rosbach Date: Wed, 2 Apr 2025 21:42:45 +0200 Subject: [PATCH] CI: Preinstall packages needed for testing and benchmark. Avoids having to compile gtest and google benchmark in every CI job. To make sure we also test downloading and building ourself, don't install for jobs that specify any matrix.packages. --- .github/workflows/cmake.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index bf826381..bf7c2a88 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -646,7 +646,7 @@ jobs: run: sudo dpkg --add-architecture i386 - name: Add ubuntu mirrors - if: runner.os == 'Linux' && matrix.packages && !contains(matrix.os, 'z15') + if: runner.os == 'Linux' && !contains(matrix.os, 'z15') # Github Actions caching proxy is at times unreliable run: | echo -e 'http://azure.archive.ubuntu.com/ubuntu\tpriority:1\n' | sudo tee /etc/apt/mirrors.txt @@ -654,10 +654,11 @@ jobs: sudo sed -i 's#http://azure.archive.ubuntu.com/ubuntu/#mirror+file:/etc/apt/mirrors.txt#' /etc/apt/sources.list - name: Install packages (Ubuntu) - if: runner.os == 'Linux' && matrix.packages && !contains(matrix.os, 'z15') + if: runner.os == 'Linux' && !contains(matrix.os, 'z15') run: | sudo apt-get update - sudo apt-get install -y --allow-downgrades --no-install-recommends ${{ matrix.packages }} + sudo apt-get install -y --allow-downgrades --no-install-recommends \ + ${{ matrix.packages || 'libgtest-dev libbenchmark-dev' }} - name: Install packages (Windows) if: runner.os == 'Windows' -- 2.47.2