From 59c38969ded83e8f0b3df2393fb078ec53163630 Mon Sep 17 00:00:00 2001 From: Ilija Tovilo Date: Tue, 9 Jan 2024 10:39:20 +0100 Subject: [PATCH] [skip ci] Remove PHP 8.0 references from CI --- .github/nightly_matrix.php | 43 ++++++++++++++++------------------- .github/workflows/nightly.yml | 10 +------- .github/workflows/push.yml | 2 -- CONTRIBUTING.md | 4 ++-- 4 files changed, 23 insertions(+), 36 deletions(-) diff --git a/.github/nightly_matrix.php b/.github/nightly_matrix.php index 59fa8e49384..ab32f774704 100644 --- a/.github/nightly_matrix.php +++ b/.github/nightly_matrix.php @@ -5,7 +5,6 @@ const BRANCHES = [ ['name' => 'PHP-8.3', 'ref' => 'PHP-8.3', 'version' => ['major' => 8, 'minor' => 3]], ['name' => 'PHP-8.2', 'ref' => 'PHP-8.2', 'version' => ['major' => 8, 'minor' => 2]], ['name' => 'PHP-8.1', 'ref' => 'PHP-8.1', 'version' => ['major' => 8, 'minor' => 1]], - ['name' => 'PHP-8.0', 'ref' => 'PHP-8.0', 'version' => ['major' => 8, 'minor' => 0]], ]; function get_branch_commit_cache_file_path(): string { @@ -49,28 +48,26 @@ function get_matrix_include(array $branches) { 'test_function_jit' => false, 'asan' => true, ]; - if ($branch['ref'] !== 'PHP-8.0') { - $jobs[] = [ - 'name' => '_REPEAT', - 'branch' => $branch, - 'debug' => true, - 'zts' => false, - 'run_tests_parameters' => '--repeat 2', - 'timeout_minutes' => 360, - 'test_function_jit' => true, - 'asan' => false, - ]; - $jobs[] = [ - 'name' => '_VARIATION', - 'branch' => $branch, - 'debug' => true, - 'zts' => true, - 'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'", - 'timeout_minutes' => 360, - 'test_function_jit' => true, - 'asan' => false, - ]; - } + $jobs[] = [ + 'name' => '_REPEAT', + 'branch' => $branch, + 'debug' => true, + 'zts' => false, + 'run_tests_parameters' => '--repeat 2', + 'timeout_minutes' => 360, + 'test_function_jit' => true, + 'asan' => false, + ]; + $jobs[] = [ + 'name' => '_VARIATION', + 'branch' => $branch, + 'debug' => true, + 'zts' => true, + 'configuration_parameters' => "CFLAGS='-DZEND_RC_DEBUG=1 -DPROFITABILITY_CHECKS=0 -DZEND_VERIFY_FUNC_INFO=1'", + 'timeout_minutes' => 360, + 'test_function_jit' => true, + 'asan' => false, + ]; } return $jobs; } diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 4eca4495730..01457da002e 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -401,7 +401,6 @@ jobs: echo memory_limit=-1 >> /etc/php.d/opcache.ini php -v - name: Test AMPHP - if: matrix.branch.ref != 'PHP-8.0' run: | repositories="amp cache dns file http parallel parser pipeline process serialization socket sync websocket-client websocket-server" X=0 @@ -420,7 +419,6 @@ jobs: done exit $X - name: Test Laravel - if: matrix.branch.ref != 'PHP-8.0' run: | git clone https://github.com/laravel/framework.git --branch=master --depth=1 cd framework @@ -434,7 +432,6 @@ jobs: exit 1 fi - name: Test ReactPHP - if: matrix.branch.ref != 'PHP-8.0' run: | repositories="async cache child-process datagram dns event-loop promise promise-stream promise-timer stream" X=0 @@ -453,7 +450,6 @@ jobs: done exit $X - name: Test Revolt PHP - if: matrix.branch.ref != 'PHP-8.0' run: | git clone https://github.com/revoltphp/event-loop.git --depth=1 cd event-loop @@ -465,7 +461,6 @@ jobs: exit 1 fi - name: Test Symfony - if: matrix.branch.ref != 'PHP-8.0' run: | git clone https://github.com/symfony/symfony.git --depth=1 cd symfony @@ -499,7 +494,6 @@ jobs: exit 1 fi - name: 'Symfony Preloading' - if: matrix.branch.ref != 'PHP-8.0' run: | php /usr/bin/composer create-project symfony/symfony-demo symfony_demo --no-progress --ignore-platform-reqs cd symfony_demo @@ -680,7 +674,7 @@ jobs: --enable-memory-sanitizer \ --with-config-file-path=/etc \ --with-config-file-scan-dir=/etc/php.d \ - ${{ matrix.branch.ref != 'PHP-8.0' && '--enable-dl-test=shared' || '' }} + --enable-dl-test=shared - name: make run: make -j$(/usr/bin/nproc) >/dev/null - name: make install @@ -724,8 +718,6 @@ jobs: fail-fast: false matrix: branch: ${{ fromJson(needs.GENERATE_MATRIX.outputs.branches) }} - exclude: - - branch: { name: 'PHP-80', ref: 'PHP-8.0', major: 8, minor: 0 } name: "${{ matrix.branch.name }}_LIBMYSQLCLIENT" runs-on: ubuntu-${{ matrix.branch.version.minor >= 3 && '22.04' || '20.04' }} steps: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 96dfa21c32a..272671c3351 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -14,8 +14,6 @@ on: - travis/* - .circleci/* branches: - - PHP-7.4 - - PHP-8.0 - PHP-8.1 - PHP-8.2 - PHP-8.3 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 571a8293fca..acb020dd2dc 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -358,8 +358,8 @@ Currently, we have the following branches in use: | master | Active development branch for PHP 8.4, which is open for backwards incompatible changes and major internal API changes. | | PHP-8.3 | Is used to release the PHP 8.3.x series. This is a current stable version and is open for bugfixes only. | | PHP-8.2 | Is used to release the PHP 8.2.x series. This is a current stable version and is open for bugfixes only. | -| PHP-8.1 | Is used to release the PHP 8.1.x series. This is a current stable version and is open for bugfixes only. | -| PHP-8.0 | Is used to release the PHP 8.0.x series. This is an old stable version and is open for security fixes only. | +| PHP-8.1 | Is used to release the PHP 8.1.x series. This is an old stable version and is open for security fixes only. | +| PHP-8.0 | This branch is closed. | | PHP-7.4 | This branch is closed. | | PHP-7.3 | This branch is closed. | | PHP-7.2 | This branch is closed. |