Merge branch 'QA_5_1' into QA_5_2

Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
This commit is contained in:
Maurício Meneghini Fauth 2022-04-20 13:37:11 -03:00
commit 3a433e160c
No known key found for this signature in database
GPG Key ID: 6A16FD38AFC89CC8
9 changed files with 21 additions and 31 deletions

View File

@ -11,10 +11,9 @@ on:
jobs:
lint-node:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Node
uses: actions/setup-node@v1
@ -26,7 +25,7 @@ jobs:
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Cache Yarn dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
@ -44,13 +43,12 @@ jobs:
lint-php-files:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
strategy:
matrix:
php-version: ["7.2"]
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up PHP ${{ matrix.php-version }}
uses: shivammathur/setup-php@v2
@ -68,7 +66,7 @@ jobs:
composer-options: "--ignore-platform-req=ext-zip"
- name: Cache coding-standard
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: .phpcs-cache
key: phpcs-cache
@ -84,13 +82,12 @@ jobs:
analyse-php:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
strategy:
matrix:
php-version: ["7.2"]
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up PHP ${{ matrix.php-version }}
uses: shivammathur/setup-php@v2

View File

@ -11,10 +11,9 @@ on:
jobs:
lint-docs:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Lint phpdoc blocks
uses: sudo-bot/action-doctum@v5

View File

@ -9,7 +9,6 @@ on:
jobs:
tests:
name: Mutation tests with PHP ${{ matrix.php-version }}
if: "!contains(github.event.head_commit.message, '[ci skip]')"
runs-on: ${{ matrix.operating-system }}
strategy:
matrix:
@ -17,7 +16,7 @@ jobs:
operating-system: [ubuntu-latest]
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Fetch github.base_ref (for diffing)
if: ${{ github.base_ref != '' }}

View File

@ -11,10 +11,9 @@ on:
jobs:
build-documentation:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Python
uses: actions/setup-python@v2
@ -29,13 +28,12 @@ jobs:
build-release:
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
strategy:
matrix:
php-version: ["7.2"]
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install gettext
run: sudo apt-get install -y gettext
@ -62,7 +60,7 @@ jobs:
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Cache Yarn dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

View File

@ -11,7 +11,7 @@ on:
jobs:
test-selenium:
name: Selenium tests on PHP ${{ matrix.php-version }} and ${{ matrix.os }}
if: "!contains(github.event.head_commit.message, '[ci skip]') && !contains(github.event.head_commit.message, '[ci selenium skip]')"
if: "!contains(github.event.head_commit.message, '[ci selenium skip]')"
runs-on: ${{ matrix.os }}
services:
database-server:
@ -56,7 +56,7 @@ jobs:
db-server: ["mysql:5.7"]
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Refresh apt cache
run: sudo apt-get update
@ -88,7 +88,7 @@ jobs:
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Cache Yarn dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

View File

@ -11,7 +11,6 @@ on:
jobs:
multi-arch-tests-php:
name: Test on PHP ${{ matrix.php-version }} (${{ matrix.arch }})
if: "!contains(github.event.head_commit.message, '[ci skip]')"
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.experimental }}
strategy:
@ -27,7 +26,7 @@ jobs:
- { php-version: '7', experimental: false, arch: 's390x', exclude-phpunit-groups: 'extension-iconv,32bit-incompatible' }
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Write script
# tcpdf allowed memory exhausted needs the memory_limit workaround
@ -60,7 +59,6 @@ jobs:
test-php:
name: Test on PHP ${{ matrix.php-version }} and ${{ matrix.os }}
if: "!contains(github.event.head_commit.message, '[ci skip]')"
runs-on: ${{ matrix.os }}
continue-on-error: ${{ matrix.experimental }}
strategy:
@ -77,7 +75,7 @@ jobs:
composer-options: '--ignore-platform-req=php+'
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
# Fetch some commits for Scrutinizer coverage upload
fetch-depth: 15
@ -130,7 +128,6 @@ jobs:
test-php-optional-extensions:
name: Test on PHP (+ ext-${{ matrix.extension }}) ${{ matrix.php-version }} and ${{ matrix.os }}
runs-on: ${{ matrix.os }}
if: "!contains(github.event.head_commit.message, '[ci skip]')"
strategy:
matrix:
php-version: ["7.2"]
@ -138,7 +135,7 @@ jobs:
extension: ["dbase", "recode"]
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
# Fetch some commits for Scrutinizer coverage upload
fetch-depth: 15
@ -190,10 +187,9 @@ jobs:
test-js:
name: Test javascript files
runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, '[ci skip]')"
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Set up Node
uses: actions/setup-node@v1
@ -205,7 +201,7 @@ jobs:
run: echo "::set-output name=dir::$(yarn cache dir)"
- name: Cache Yarn dependencies
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

View File

@ -16,7 +16,7 @@ jobs:
php-version: ["8.0"]
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
- name: Install Gettext
run: |

View File

@ -41,6 +41,7 @@ phpMyAdmin - ChangeLog
- issue #17418 Remove the use of the deprecated `strftime` function in OpenDocument exports
- issue #17111 Enable tabindex recompute on preview button while insert new rows
- issue #17474 Fix invalid SQL generated when PRIMARY/UNIQUE key contains a POINT column
- issue #17484 Fix setup's CSS not loading when the URL doesn't have a trailing slash
5.1.3 (2022-02-10)
- issue #17308 Fix broken pagination links in the navigation sidebar

View File

@ -6,7 +6,7 @@
<title>phpMyAdmin setup</title>
<link href="../favicon.ico" rel="icon" type="image/x-icon">
<link href="../favicon.ico" rel="shortcut icon" type="image/x-icon">
<link href="styles.css" rel="stylesheet" type="text/css">
<link href="../setup/styles.css" rel="stylesheet" type="text/css">
<script type="text/javascript" src="../js/vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../js/vendor/jquery/jquery-ui.min.js"></script>
<script type="text/javascript" src="../js/vendor/bootstrap/bootstrap.bundle.min.js"></script>