From 7f649b08c9fb2460afedb406e3fbaf8eb42319da Mon Sep 17 00:00:00 2001
From: David Buchmann <david.buchmann@liip.ch>
Date: Tue, 17 Jun 2025 10:11:54 +0200
Subject: [PATCH] ubuntu 20.04 is discontinued on github. fix varnish build

drop varnish modules on some legacy builds
---
 .github/workflows/ci.yml           | 29 +++++++++++++----------------
 .github/workflows/setup-nginx.sh   |  2 +-
 .github/workflows/setup-varnish.sh |  2 ++
 tests/install-varnish-modules.sh   |  2 +-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 617bf234..a521e93d 100644
--- a/.github/workflows/ci.yml
+++ b/.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,10 +79,9 @@ 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'
 
     strategy:
       fail-fast: false
@@ -132,7 +129,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 +173,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,10 +217,10 @@ 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'
+      VARNISH_VERSION: '7.1'
+      VARNISH_MODULES_VERSION: '0.20.0'
 
     steps:
       - name: Setup PHP
diff --git a/.github/workflows/setup-nginx.sh b/.github/workflows/setup-nginx.sh
index f1d57fe5..918195cb 100755
--- a/.github/workflows/setup-nginx.sh
+++ b/.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"
diff --git a/.github/workflows/setup-varnish.sh b/.github/workflows/setup-varnish.sh
index 3ba0af40..481afd9c 100755
--- a/.github/workflows/setup-varnish.sh
+++ b/.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 ###"
diff --git a/tests/install-varnish-modules.sh b/tests/install-varnish-modules.sh
index 5948ac89..6982d4db 100755
--- a/tests/install-varnish-modules.sh
+++ b/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/