From 932df7b4f1abe487f7c0ac5fb70d257444304ee1 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Fri, 22 Jan 2021 00:55:51 +0100 Subject: [PATCH 1/4] Use PHP 8.0 for OSX CI Signed-off-by: William Desportes --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 01ee69bd20..c58d811d5e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,12 +49,12 @@ jobs: node_js: 10 before_install: - export PATH="/usr/local/opt/gettext/bin:$PATH" - - echo "memory_limit=-1" > /usr/local/etc/php/7.4/conf.d/50-travis.ini - - echo "pcre.jit=0" >> /usr/local/etc/php/7.4/conf.d/50-travis.ini + - echo "memory_limit=-1" > /usr/local/etc/php/8.0/conf.d/50-travis.ini + - echo "pcre.jit=0" >> /usr/local/etc/php/8.0/conf.d/50-travis.ini addons: homebrew: packages: - - php + - php@8.0 - composer update: true From 77ca9cd88daf5c3a7c7d9f9ee28f41ad11120eb1 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Fri, 22 Jan 2021 01:06:23 +0100 Subject: [PATCH 2/4] Add support for ci-skip on GitHub acions Signed-off-by: William Desportes --- .github/workflows/lint-and-analyse-php.yml | 3 +++ .github/workflows/lint-docs.yml | 1 + .github/workflows/other-tools.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/lint-and-analyse-php.yml b/.github/workflows/lint-and-analyse-php.yml index bad9aa2207..b84a6a6ffd 100644 --- a/.github/workflows/lint-and-analyse-php.yml +++ b/.github/workflows/lint-and-analyse-php.yml @@ -11,6 +11,7 @@ on: jobs: lint-node: runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: - uses: actions/checkout@v2 - uses: actions/setup-node@v1 @@ -35,6 +36,7 @@ jobs: lint-php-files: runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: - uses: actions/checkout@v2 - name: Lint PHP files @@ -68,6 +70,7 @@ jobs: analyse-php: runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: - uses: actions/checkout@v2 - name: Use php 7.2 diff --git a/.github/workflows/lint-docs.yml b/.github/workflows/lint-docs.yml index dac27f8263..36c706f435 100644 --- a/.github/workflows/lint-docs.yml +++ b/.github/workflows/lint-docs.yml @@ -11,6 +11,7 @@ on: jobs: lint-docs: runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: - uses: actions/checkout@v2 - name: Lint phpdoc blocks diff --git a/.github/workflows/other-tools.yml b/.github/workflows/other-tools.yml index 385e1ce834..d59cc1fa14 100644 --- a/.github/workflows/other-tools.yml +++ b/.github/workflows/other-tools.yml @@ -11,6 +11,7 @@ on: jobs: build-documentation: runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 @@ -23,6 +24,7 @@ jobs: build-release: runs-on: ubuntu-latest + if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: - uses: actions/checkout@v2 - name: Use php 7.1 From ddd98b9c382558c1c2e1d51680b856ae1227e2b6 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Fri, 22 Jan 2021 00:42:33 +0100 Subject: [PATCH 3/4] Add a ChangeLog entry for #16463 [ci skip] Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 82d2bed7c0..f9686551b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -75,6 +75,7 @@ phpMyAdmin - ChangeLog - issue #16565 Added 'IF EXISTS' to 'DROP EVENT' when updating events to avoid replication issues - issue Removed metro fonts that where Apache-2.0 files that are incompatible with GPL-2.0 - issue #16464 Made the relation view default to the current database when creating relations +- issue #16463 Fixed 'REFERENCES' privilege checkbox's title on new MySQL versions and on MariaDB 5.0.5 (not yet released) - issue #14494 Fix uncaught TypeError when editing partitioning From aa9ca81b19a4e749a01703a8b550bc64e549a72c Mon Sep 17 00:00:00 2001 From: William Desportes Date: Fri, 22 Jan 2021 01:10:41 +0100 Subject: [PATCH 4/4] Add support for ci-skip on GitHub actions tests workflows [ci skip] Signed-off-by: William Desportes --- .github/workflows/tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index b3f84dc8c4..49bd3d63b2 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -11,6 +11,7 @@ on: 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 }} strategy: matrix: @@ -64,6 +65,7 @@ jobs: test-php-dbase: name: Test on php ${{ matrix.php-version }} and ${{ matrix.os }} runs-on: ${{ matrix.os }} + if: "!contains(github.event.head_commit.message, '[ci skip]')" strategy: matrix: php-version: ["7.1"] @@ -112,6 +114,7 @@ jobs: test-php-recode: name: Test on php ${{ matrix.php-version }} and ${{ matrix.os }} runs-on: ${{ matrix.os }} + if: "!contains(github.event.head_commit.message, '[ci skip]')" strategy: matrix: php-version: ["7.1"] @@ -160,6 +163,7 @@ jobs: test-php-random: name: Test on php ${{ matrix.php-version }} and ${{ matrix.os }} runs-on: ${{ matrix.os }} + if: "!contains(github.event.head_commit.message, '[ci skip]')" strategy: matrix: php-version: ["7.4"]