From af6172c8f22c4e2df0425dd5a47d73651c1b9ea9 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 27 Feb 2025 17:01:17 +0100 Subject: [PATCH] GHA/linux: merge two package install steps Merge pytest prereq package install step into the main package install step, to save install time. Closes #16509 --- .github/workflows/linux.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 4594bd8a60..335773055c 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -304,7 +304,8 @@ jobs: libtool autoconf automake pkgconf ninja-build \ ${{ matrix.build.install_steps != 'skipall' && matrix.build.install_steps != 'skiprun' && 'stunnel4' || '' }} \ libpsl-dev libbrotli-dev libzstd-dev \ - ${{ matrix.build.install_packages }} + ${{ matrix.build.install_packages }} \ + ${{ contains(matrix.build.install_steps, 'pytest') && 'apache2 apache2-dev libnghttp2-dev vsftpd' || '' }} python3 -m venv $HOME/venv - name: 'install prereqs' @@ -319,11 +320,6 @@ jobs: ${{ matrix.build.install_packages }} python3 -m venv $HOME/venv - - name: 'install prereqs for pytest' - if: contains(matrix.build.install_steps, 'pytest') - run: | - sudo apt-get -o Dpkg::Use-Pty=0 install apache2 apache2-dev libnghttp2-dev vsftpd - - name: 'install dependencies' if: startsWith(matrix.build.container, 'alpine') run: | -- 2.47.3