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

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2022-12-11 22:13:30 +01:00
parent 995717f4a0 0543c810a7
commit e24169b0ba
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,7 +17,7 @@ on:
jobs: jobs:
# Basic checks, e.g. parse errors, commit messages, etc. # Basic checks, e.g. parse errors, commit messages, etc.
basic-checks: basic-checks:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
include: include:
@@ -29,7 +29,7 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
fetch-depth: 100 fetch-depth: 100
@@ -46,12 +46,12 @@ jobs:
PHP_VERSION: ${{ matrix.php }} PHP_VERSION: ${{ matrix.php }}
run: | run: |
cd phpBB cd phpBB
echo "::set-output name=dir::$(composer config cache-files-dir)" echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
echo "::set-output name=version::${PHP_VERSION%.*}" echo "version=${PHP_VERSION%.*}" >> $GITHUB_OUTPUT
cd .. cd ..
- name: Cache Composer dependencies - name: Cache Composer dependencies
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: ${{ steps.composer-cache.outputs.dir }} path: ${{ steps.composer-cache.outputs.dir }}
key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -96,7 +96,7 @@ jobs:
# Tests for MySQL and MariaDB # Tests for MySQL and MariaDB
mysql-tests: mysql-tests:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
include: include:
@@ -161,14 +161,14 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v3
- id: database-type - id: database-type
env: env:
MATRIX_DB: ${{ matrix.db }} MATRIX_DB: ${{ matrix.db }}
run: | run: |
db=$(echo "${MATRIX_DB%%:*}") db=$(echo "${MATRIX_DB%%:*}")
echo "::set-output name=db::$db" echo "db=$db" >> $GITHUB_OUTPUT
- name: Setup PHP - name: Setup PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
@@ -183,12 +183,12 @@ jobs:
PHP_VERSION: ${{ matrix.php }} PHP_VERSION: ${{ matrix.php }}
run: | run: |
cd phpBB cd phpBB
echo "::set-output name=dir::$(composer config cache-files-dir)" echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
echo "::set-output name=version::${PHP_VERSION%.*}" echo "version=${PHP_VERSION%.*}" >> $GITHUB_OUTPUT
cd .. cd ..
- name: Cache Composer dependencies - name: Cache Composer dependencies
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: ${{ steps.composer-cache.outputs.dir }} path: ${{ steps.composer-cache.outputs.dir }}
key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -237,7 +237,7 @@ jobs:
# Tests for PostgreSQL # Tests for PostgreSQL
postgres-tests: postgres-tests:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
include: include:
@@ -294,14 +294,14 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v3
- id: database-type - id: database-type
env: env:
MATRIX_DB: ${{ matrix.db }} MATRIX_DB: ${{ matrix.db }}
run: | run: |
db=$(echo "${MATRIX_DB%%:*}") db=$(echo "${MATRIX_DB%%:*}")
echo "::set-output name=db::$db" echo "db=$db" >> $GITHUB_OUTPUT
- name: Setup PHP - name: Setup PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
@@ -316,12 +316,12 @@ jobs:
PHP_VERSION: ${{ matrix.php }} PHP_VERSION: ${{ matrix.php }}
run: | run: |
cd phpBB cd phpBB
echo "::set-output name=dir::$(composer config cache-files-dir)" echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
echo "::set-output name=version::${PHP_VERSION%.*}" echo "version=${PHP_VERSION%.*}" >> $GITHUB_OUTPUT
cd .. cd ..
- name: Cache Composer dependencies - name: Cache Composer dependencies
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: ${{ steps.composer-cache.outputs.dir }} path: ${{ steps.composer-cache.outputs.dir }}
key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -349,7 +349,7 @@ jobs:
# Other database types, namely sqlite3 and mssql # Other database types, namely sqlite3 and mssql
other-tests: other-tests:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
include: include:
@@ -392,7 +392,7 @@ jobs:
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v3
- id: database-type - id: database-type
env: env:
@@ -404,7 +404,7 @@ jobs:
else else
db=$(echo "${MATRIX_DB%%:*}") db=$(echo "${MATRIX_DB%%:*}")
fi fi
echo "::set-output name=db::$db" echo "db=$db" >> $GITHUB_OUTPUT
- name: Setup PHP - name: Setup PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
@@ -419,12 +419,12 @@ jobs:
PHP_VERSION: ${{ matrix.php }} PHP_VERSION: ${{ matrix.php }}
run: | run: |
cd phpBB cd phpBB
echo "::set-output name=dir::$(composer config cache-files-dir)" echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
echo "::set-output name=version::${PHP_VERSION%.*}" echo "version=${PHP_VERSION%.*}" >> $GITHUB_OUTPUT
cd .. cd ..
- name: Cache Composer dependencies - name: Cache Composer dependencies
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: ${{ steps.composer-cache.outputs.dir }} path: ${{ steps.composer-cache.outputs.dir }}
key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }}
@@ -489,7 +489,7 @@ jobs:
git config --system core.autocrlf false git config --system core.autocrlf false
git config --system core.eol lf git config --system core.eol lf
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v3
- name: Setup PHP - name: Setup PHP
uses: shivammathur/setup-php@v2 uses: shivammathur/setup-php@v2
@@ -503,13 +503,13 @@ jobs:
id: composer-cache id: composer-cache
run: | run: |
cd phpBB cd phpBB
echo "::set-output name=dir::$(composer config cache-files-dir)" echo "dir=$(composer config cache-files-dir)" >> $env:GITHUB_OUTPUT
$major_version="${{ matrix.php }}".substring(0,1) $major_version="${{ matrix.php }}".substring(0,1)
echo "::set-output name=version::$major_version" echo "version=$major_version" >> $env:GITHUB_OUTPUT
cd .. cd ..
- name: Cache Composer dependencies - name: Cache Composer dependencies
uses: actions/cache@v2 uses: actions/cache@v3
with: with:
path: ${{ steps.composer-cache.outputs.dir }} path: ${{ steps.composer-cache.outputs.dir }}
key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }} key: composer-${{ steps.composer-cache.outputs.version }}-${{ hashFiles('phpBB/composer.lock') }}