diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f47ca517..4da00515 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -18,16 +18,12 @@ jobs: fail-fast: true matrix: include: - - php: '8.0' - laravel: 9 - - php: '8.1' - laravel: 10 - php: '8.2' - laravel: 11 + laravel: 12 - php: '8.3' - laravel: 11 + laravel: 12 - php: '8.4' - laravel: 11 + laravel: 12 name: PHP ${{ matrix.php }} - Laravel ${{ matrix.laravel }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e0f2737..64f02169 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Release Notes -## [Unreleased](https://github.com/laravel/sail/compare/v1.43.0...1.x) +## [Unreleased](https://github.com/laravel/sail/compare/v1.43.1...1.x) + +## [v1.43.1](https://github.com/laravel/sail/compare/v1.43.0...v1.43.1) - 2025-05-19 + +* Add missing rabbitmq volume by [@kostamilorava](https://github.com/kostamilorava) in https://github.com/laravel/sail/pull/798 ## [v1.43.0](https://github.com/laravel/sail/compare/v1.42.0...v1.43.0) - 2025-05-13 diff --git a/bin/sail b/bin/sail index 816dc0a4..0f753621 100755 --- a/bin/sail +++ b/bin/sail @@ -489,7 +489,7 @@ elif [ "$1" == "mysql" ]; then ARGS+=(exec) [ ! -t 0 ] && ARGS+=(-T) ARGS+=(mysql bash -c) - ARGS+=("MYSQL_PWD=\${MYSQL_PASSWORD} mysql -u \${MYSQL_USER} \${MYSQL_DATABASE}") + ARGS+=("MYSQL_PWD=\${MYSQL_PASSWORD} mysql -u \${MYSQL_USER} \${MYSQL_DATABASE} \${MYSQL_EXTRA_OPTIONS}") else sail_is_not_running fi diff --git a/stubs/mysql.stub b/stubs/mysql.stub index c4d66f97..f690705d 100644 --- a/stubs/mysql.stub +++ b/stubs/mysql.stub @@ -9,6 +9,7 @@ mysql: MYSQL_USER: '${DB_USERNAME}' MYSQL_PASSWORD: '${DB_PASSWORD}' MYSQL_ALLOW_EMPTY_PASSWORD: 1 + MYSQL_EXTRA_OPTIONS: '${MYSQL_EXTRA_OPTIONS}' volumes: - 'sail-mysql:/var/lib/mysql' - './vendor/laravel/sail/database/mysql/create-testing-database.sh:/docker-entrypoint-initdb.d/10-create-testing-database.sh'