Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update 3x.yml #2653

Draft
wants to merge 10 commits into
base: 3.x
Choose a base branch
from
Draft

Update 3x.yml #2653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
17fb64f
Update 3x.yml
kporras07 Dec 6, 2024
e8ba7df
8.0 and 8.4.
kporras07 Dec 6, 2024
d967cc5
Variable in phpunit.
kporras07 Dec 6, 2024
c3413b4
[DEVX-3831] PHP 8.4 Compatibility; removes support for PHP 8.1 and ea…
greg-1-anderson Dec 16, 2024
6687c21
Set Terminus version to 4.0.0-dev and start a CHANGELOG
greg-1-anderson Dec 16, 2024
353cb73
Check for attempts at using old versions of PHP, and fail fast with a…
greg-1-anderson Dec 16, 2024
17ba55a
Merge branch '3.x' of github.com:pantheon-systems/terminus into php-8…
kporras07 Jan 17, 2025
516135f
Force terminus allow unsupported versions.
kporras07 Jan 17, 2025
f399a59
Temporarily only test in 8.4.
kporras07 Jan 17, 2025
500acc4
Merge branch '4.x' of github.com:pantheon-systems/terminus into php-8…
kporras07 Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/3x.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Terminus 3.x
name: Terminus 4.x
on:
push:
schedule:
Expand All @@ -24,7 +24,7 @@ jobs:
checkout_build:
runs-on: ubuntu-latest
container:
image: quay.io/pantheon-public/php-ci:v7.4
image: quay.io/pantheon-public/php-ci:v8.2
name: Checkout & build Phar
steps:
- name: Checkout
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
strategy:
matrix:
operating-system: [ 'macos-latest' ]
php-versions: [ '7.4', '8.2', '8.3' ]
php-versions: [ '8.4' ]
max-parallel: 1
env:
TERMINUS_TOKEN: ${{ secrets.TERMINUS_TOKEN }}
Expand All @@ -76,6 +76,7 @@ jobs:
TERMINUS_VERIFY_HOST_CERT: ${{ vars.TERMINUS_VERIFY_HOST_CERT }}
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
HOMBEBREW_NO_AUTO_UPDATE: 1
TERMINUS_ALLOW_UNSUPPORTED_NEWER_PHP: 1
needs: [ checkout_build ]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't set this in CI, update wherever those supported values are set.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My intention was just to surface errors in this PR to address them later. But I've failed to do so 😂 I guess we will wait until we actually prioritize a ticket to provide this support :)

steps:
- name: Install SSH key
Expand Down Expand Up @@ -127,7 +128,7 @@ jobs:
runs-on: ubuntu-latest
name: Release
container:
image: quay.io/pantheon-public/php-ci:v7.4
image: quay.io/pantheon-public/php-ci:v8.2
needs: [ functional ]
if: ${{ startsWith(github.ref, 'refs/tags/') && github.repository == 'pantheon-systems/terminus' }}
steps:
Expand Down
10 changes: 9 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
# Change Log
All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org)

## 3.6.2-dev -
## 4.0.0-dev -

### Added

- Support for PHP 8.4

### Removed

- Support for PHP versions prior to 8.2

## 3.6.1 - 2024-12-04

Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ A PHAR file must also be built before running tests.

The functional test files are in the `tests/Functional` directory.

The Terminus 3.x functional tests can be run via:
The Terminus 4.x functional tests can be run via:

```bash
cd /install/location/terminus
Expand Down
10 changes: 5 additions & 5 deletions bin/terminus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@
// Unset memory limit
ini_set('memory_limit', -1);

if (version_compare(PHP_VERSION, '7.4.0', '<') === true) {
if (version_compare(PHP_VERSION, '8.2.0', '<') === true) {
fwrite(STDERR, "\n");
fwrite(STDERR, 'Sorry, your PHP version (' . PHP_VERSION . ') is no longer supported.' . "\n");
fwrite(STDERR, 'Upgrade to PHP 7.4 or newer to use Terminus 3. For PHP versions prior to 7.4, downgrade to Terminus 2.x.' . "\n\n");
fwrite(STDERR, 'Upgrade to PHP 8.2 or newer to use Terminus 4. For PHP versions prior to 8.2, downgrade to Terminus 3.x.' . "\n\n");
fwrite(STDERR, 'For more information, see https://pantheon.io/docs/terminus/updates#php-version-compatibility-matrix' . "\n\n");
exit(1);
}

if (!getenv('TERMINUS_ALLOW_UNSUPPORTED_NEWER_PHP') && version_compare(PHP_VERSION, '8.4.0', '>=') === true) {
if (!getenv('TERMINUS_ALLOW_UNSUPPORTED_NEWER_PHP') && version_compare(PHP_VERSION, '8.5.0', '>=') === true) {
fwrite(STDERR, "\n");
fwrite(STDERR, 'PHP 8.4+ is not supported by this version of Terminus.' . "\n");
fwrite(STDERR, 'PHP 8.5+ is not supported by this version of Terminus.' . "\n");
fwrite(STDERR, 'Check for new versions at https://github.com/pantheon-systems/terminus/releases' . "\n");
fwrite(STDERR, "\n");
fwrite(STDERR, 'Set environment variable TERMINUS_ALLOW_UNSUPPORTED_NEWER_PHP to try continuing anyway.' . "\n");
Expand All @@ -32,7 +32,7 @@ if (!getenv('TERMINUS_ALLOW_UNSUPPORTED_NEWER_PHP') && version_compare(PHP_VERSI

// This variable is automatically managed via updateDependenciesversion() in /RoboFile.php,
// which is run after every call to composer update.
$terminusPluginsDependenciesVersion = 'a6b56bb299';
$terminusPluginsDependenciesVersion = '51e2c517dd';

// Cannot use $_SERVER superglobal since that's empty during phpunit testing
// getenv('HOME') isn't set on Windows and generates a Notice.
Expand Down
17 changes: 6 additions & 11 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,32 +16,27 @@
"php": ">=7.4",
"ext-json": "*",
"composer/semver": "^3",
"consolidation/comments": "^1.0.2",
"consolidation/comments": "^1.0.2 || ^2",
"consolidation/filter-via-dot-access-data": "^2.0",
"consolidation/output-formatters": "^4",
"consolidation/robo": "^3 || ^5",
"consolidation/self-update": "^2.0.4",
"consolidation/site-alias": "^4.0",
"czproject/git-php": "^4.0",
"guzzlehttp/guzzle": "^7.0",
"justinrainbow/json-schema": "^5.2",
"league/container": "^3",
"league/container": "^4.2",
"monolog/monolog": "^2.2",
"psy/psysh": "^0.11.9",
"psy/psysh": "^0.12.6",
"rogervila/array-diff-multidimensional": "^2.0",
"symfony/console": "^5",
"symfony/finder": "^5",
"symfony/process": "^5",
"symfony/yaml": "^5",
"twig/twig": "^3.3",
"consolidation/robo": "^3.0"
"twig/twig": "^3.3"
},
"require-dev": {
"ext-pcov": "*",
"behat/behat": "^3.2.2",
"erusev/parsedown": "^1.7",
"friendsofphp/php-cs-fixer": "^3.17",
"pcov/clobber": "^2.0",
"php-vcr/php-vcr": "~1.5.2",
"phpunit/php-code-coverage": "^9.2",
"phpunit/phpcov": "^8.2",
"phpunit/phpunit": "^9",
Expand Down Expand Up @@ -168,7 +163,7 @@
"preferred-install": "dist",
"sort-packages": true,
"platform": {
"php": "7.4"
"php": "8.2.26"
},
"allow-plugins": {
"phpstan/extension-installer": true
Expand Down
Loading
Loading