mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 02:21:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2021-03-02 19:50:02 +01:00
parent 3629b587fa 66cbf2607b
commit 382c7acbc8
2 changed files with 10 additions and 6 deletions
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_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' ]

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

@@ -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