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

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 4594bd8a60f259b229b950f098d579a045f85aa9..335773055c294a0f507039eb8454cad2e6948ff0 100644 (file)
--- 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: |