Merge pull request #6148 from rxu/ticket/16711

[ticket/16711] Fix PHP 8.1 builds

.github/setup-webserver.sh

@@ -28,9 +28,15 @@ NGINX_PHP_CONF="$DIR/nginx-php.conf"
 PHP_FPM_BIN="/usr/sbin/php-fpm$PHP_VERSION"
 PHP_FPM_CONF="$DIR/php-fpm.conf"
 
-if [ ! -f $PHP_FPM_BIN ] && [ "$PHP_VERSION" == '8.1' ] && [ -f "/usr/bin/php-fpm" ]
+if [ "$PHP_VERSION" == '8.1' ]
 then
-	PHP_FPM_BIN="/usr/bin/php-fpm"
+	if [ -f "/usr/sbin/php-fpm8.0" ]
+	then
+		PHP_FPM_BIN="/usr/sbin/php-fpm8.0"
+	elif [ ! -f $PHP_FPM_BIN ] && [ -f "/usr/bin/php-fpm" ]
+	then
+		PHP_FPM_BIN="/usr/bin/php-fpm"
+	fi
 fi
 
 if [ ! -f $PHP_FPM_BIN ] && [ "$PHP_VERSION" != '8.1' ]

.github/workflows/tests.yml

@@ -123,8 +123,8 @@ jobs:
                       db: "mysql:8.0"
                     - php: '8.0'
                       db: "mysql:5.7"
-                    # - php: '8.1' ## Disabled since currently unstable
-                    #   db: "mysql:5.7"
+                    - php: '8.1'
+                      db: "mysql:5.7"
 
         name: PHP ${{ matrix.php }} - ${{ matrix.db_alias != '' && matrix.db_alias || matrix.db }}
 
@@ -152,7 +152,6 @@ jobs:
                 ports:
                     - 6379:6379
 
-
         steps:
             - name: Checkout repository
               uses: actions/checkout@v2
@@ -272,7 +271,6 @@ jobs:
                 ports:
                     - 6379:6379
 
-
         steps:
             - name: Checkout repository
               uses: actions/checkout@v2