Separate 18.04 and common requirements

.github/workflows/ci.yml

@@ -94,20 +94,20 @@ jobs:
       - name: Check if running in container
         if: matrix.container != ''
         run: echo "GHA_CONTAINER=${{ matrix.container }}" >> $GITHUB_ENV
-      - name: If running in container, upgrade packages
-        if: matrix.container == 'ubuntu:18.04'
+      - name: If running in container, upgrade common packages
+        if: matrix.container != ''
         run: |
-            apt-get -o Acquire::Retries=3 update && DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata && apt-get -o Acquire::Retries=3 install -y sudo software-properties-common wget curl apt-transport-https make apt-file sudo unzip libssl-dev build-essential autotools-dev autoconf automake g++ libc++-helpers python ruby cpio gcc-multilib g++-multilib pkgconf python3 python3-pip ccache libpython-dev
+            apt-get -o Acquire::Retries=3 update && DEBIAN_FRONTEND=noninteractive apt-get -y install tzdata && apt-get -o Acquire::Retries=3 install -y sudo software-properties-common wget curl apt-transport-https make apt-file sudo unzip libssl-dev build-essential autotools-dev autoconf automake g++ python ruby cpio gcc-multilib g++-multilib pkgconf python3 python3-pip ccache
             sudo apt-add-repository ppa:git-core/ppa
             sudo apt-get -o Acquire::Retries=3 update && apt-get -o Acquire::Retries=3 -y install git
             sudo python3 -m pip install --upgrade pip
             python3 -m pip --version
             lsb_release -a
             sudo python3 -m pip install cmake
-      - name: Packages for 20.04
-        if: matrix.container == 'ubuntu:20.04'
+      - name: Packages for 18.04 only
+        if: matrix.container == 'ubuntu:18.04'
         run: |
-            apt-get update && apt-get -y install sudo
+            apt-get update && apt-get -y install libpython-dev libc++-helpers
 
       - uses: actions/checkout@v3