Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/roots/trellis
Browse files Browse the repository at this point in the history
  • Loading branch information
pacotole committed Apr 12, 2023
2 parents cf7c994 + 02cfc36 commit 4e071ba
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 1 deletion.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
### 1.21.0: April 5th, 2023
* Add optional PHP 8.2 support [#1485](https://github.com/roots/trellis/pull/1485)
* Default to PHP 8.1 [#1484](https://github.com/roots/trellis/pull/1484)
* Use appropriate mount_option for 'parallels' provider [#1481](https://github.com/roots/trellis/pull/1481)

**Full Changelog**: https://github.com/roots/trellis/compare/v1.20.1...v1.21.0

### 1.20.1: March 7th, 2023
* Fix invalid arg error in ferm task [#1480](https://github.com/roots/trellis/pull/1480)
* Fix `ansible_user` references for local provisioning [#1479](https://github.com/roots/trellis/pull/1479)
Expand Down
2 changes: 1 addition & 1 deletion group_vars/all/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apt_package_state: present
apt_security_package_state: latest
apt_dev_package_state: latest
composer_keep_updated: true
php_version: "8.0"
php_version: "8.1"
ntp_timezone: Etc/UTC
ntp_manage_config: true
www_root: /srv/www
Expand Down
18 changes: 18 additions & 0 deletions roles/php/vars/8.2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
php_extensions_default:
php8.2-bcmath: "{{ apt_package_state }}"
php8.2-cli: "{{ apt_package_state }}"
php8.2-curl: "{{ apt_package_state }}"
php8.2-dev: "{{ apt_package_state }}"
php8.2-fpm: "{{ apt_package_state }}"
php8.2-imagick: "{{ apt_package_state }}"
php8.2-intl: "{{ apt_package_state }}"
php8.2-mbstring: "{{ apt_package_state }}"
php8.2-mysql: "{{ apt_package_state }}"
php8.2-xml: "{{ apt_package_state }}"
php8.2-xmlrpc: "{{ apt_package_state }}"
php8.2-zip: "{{ apt_package_state }}"

php_memcached_packages:
php8.2-memcached: "{{ apt_package_state }}"

php_xdebug_package: php8.2-xdebug

0 comments on commit 4e071ba

Please sign in to comment.