makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/16711] Fix PHP 8.1 builds

Browse source 
PHPBB3-16711
This commit is contained in:
rxu 2021-02-22 12:16:23 +07:00
parent bd1c3c87b7
commit 4ce2643bdb
No known key found for this signature in database
GPG key ID: 955F0567380E586A
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/setup-webserver.sh vendored
View file

@ -28,9 +28,15 @@ NGINX_PHP_CONF="$DIR/nginx-php.conf"
PHP_FPM_BIN="/usr/sbin/php-fpm$PHP_VERSION" PHP_FPM_BIN="/usr/sbin/php-fpm$PHP_VERSION"
PHP_FPM_CONF="$DIR/php-fpm.conf" 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 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 fi
if [ ! -f $PHP_FPM_BIN ] && [ "$PHP_VERSION" != '8.1' ] if [ ! -f $PHP_FPM_BIN ] && [ "$PHP_VERSION" != '8.1' ]

6
.github/workflows/tests.yml vendored
View file

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