ubuntu 20.04 is discontinued on github

Author: dbu

.github/workflows/ci.yml

@@ -16,29 +16,27 @@ jobs:
       VARNISH_VERSION: ${{ matrix.varnish-version }}
       VARNISH_MODULES_VERSION: ${{ matrix.varnish-modules-version }}
     name: PHP ${{ matrix.php }} Varnish ${{ matrix.varnish-version }} SF ${{ matrix.symfony-version }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         varnish-version: ['6.6']
-        varnish-modules-version: ['0.18.0']
-        php: ['8.1', '8.2', '8.3']
+        php: ['8.1', '8.2', '8.3', '8.4']
         include:
-        - php: '8.1'
-          symfony-version: '6.*'
         - php: '8.1'
           varnish-version: '7.1'
           varnish-modules-version: '0.20.0'
-        - php: '8.2'
-          symfony-version: '7.*'
         - php: '8.2'
           varnish-version: '7.1'
           varnish-modules-version: '0.20.0'
         - php: '8.3'
-          symfony-version: '7.*'
-        - php: '8.3'
           varnish-version: '7.1'
           varnish-modules-version: '0.20.0'
+        - php: '8.4'
+          varnish-version: '7.1'
+          varnish-modules-version: '0.20.0'
+        - php: '8.4'
+          symfony-version: '7.*'
 
     steps:
       - name: Setup PHP
@@ -81,7 +79,7 @@ jobs:
 
   varnish5:
     name: PHP ${{ matrix.php }} Legacy Varnish 5
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       VARNISH_VERSION: '5.1'
       VARNISH_MODULES_VERSION: '0.14.0'
@@ -132,7 +130,7 @@ jobs:
 
   varnish4:
     name: PHP ${{ matrix.php }} Legacy Varnish 4
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       VARNISH_VERSION: '4.1'
       VARNISH_MODULES_VERSION: '' # varnish modules compilation fails, not sure why
@@ -176,7 +174,7 @@ jobs:
 
   lowest:
     name: PHP ${{ matrix.php }} Lowest, Varnish 3
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       VARNISH_VERSION: '3.0'
       VARNISH_MODULES_VERSION: ''
@@ -220,7 +218,7 @@ jobs:
 
   coverage:
     name: Code Coverage
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       VARNISH_VERSION: '6.6'
       VARNISH_MODULES_VERSION: '0.18.0'

.github/workflows/setup-nginx.sh

@@ -3,5 +3,5 @@
 set -e
 # Install NGINX
 sudo apt-get remove nginx
-sudo rm /usr/sbin/nginx
+sudo rm -f /usr/sbin/nginx
 sh "${GITHUB_WORKSPACE}/tests/install-nginx.sh"

.github/workflows/setup-varnish.sh

@@ -5,3 +5,5 @@ echo "### Installing Varnish $VARNISH_VERSION ###"
 VARNISH_VERSION=$VARNISH_VERSION bash -c 'curl -s https://packagecloud.io/install/repositories/varnishcache/varnish${VARNISH_VERSION//./}/script.deb.sh' | sudo bash
 sudo apt-get install varnish
 if [ "$VARNISH_MODULES_VERSION" != "" ]; then sh "${GITHUB_WORKSPACE}/tests/install-varnish-modules.sh"; fi
+
+echo "### Varnish Modules Installed ###"

tests/install-varnish-modules.sh

@@ -3,7 +3,7 @@
 set -e
 
 echo "### Installing Varnish Modules ${VARNISH_MODULES_VERSION} ###"
-sudo apt-get install build-essential automake varnish-dev python3-sphinx
+sudo apt-get install build-essential automake libvarnishapi-dev python3-sphinx
 
 curl -A "FOS Github" -o /tmp/varnish-modules.tar.gz -D - -L -s https://github.com/varnish/varnish-modules/archive/refs/tags/${VARNISH_MODULES_VERSION}.tar.gz
 tar zxpf /tmp/varnish-modules.tar.gz -C /tmp/