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

Jump to bottom

Laravel 5.5 #1352

Merged
merged 3 commits into from
Sep 1, 2017
Merged

Laravel 5.5 #1352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0772d0c
Laravel 5.5
beornlake Aug 31, 2017
fe27571
Laravel 5.5
beornlake Aug 31, 2017
7326d19
Merge branch 'laravel55' of https://github.com/beornlake/deployer int…
beornlake Aug 31, 2017
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
10 changes: 7 additions & 3 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## beornlake PR
- Updated Laravel recipe to not run 'artisan:optimize' on Laravel >= 5.5, as that command is now deprecated ([see upgrade notes](https://laravel.com/docs/5.5/upgrade)).
- Laravel version check defaults to 5.5 if not found.

## master
[v6.0.2...master](https://github.com/deployphp/deployer/compare/v6.0.2...master)

Expand All @@ -8,7 +12,7 @@
## v6.0.2
[v6.0.1...v6.0.2](https://github.com/deployphp/deployer/compare/v6.0.1...v6.0.2)

### Fixed
### Fixed
- Fixed bug with curl ssh check in _Httpie_ util

## v6.0.1
Expand Down Expand Up @@ -42,7 +46,7 @@
- Improved environment variables management
- Fixed `runLocally` to not cd into remote dir

### Removed
### Removed
- Removed `terminate_message` option
- Removed `Result` class

Expand Down Expand Up @@ -70,7 +74,7 @@
## v5.1.1
[v5.1.0...v5.1.1](https://github.com/deployphp/deployer/compare/v5.1.0...v5.1.1)

### Fixed
### Fixed
- Fixed bug with `self-update` warnings [#1226]


Expand Down
9 changes: 7 additions & 2 deletions recipe/laravel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@

preg_match_all('/(\d+\.?)+/', $result, $matches);

$version = $matches[0][0] ?? 5.4;
$version = $matches[0][0] ?? 5.5;

return $version;
});
Expand Down Expand Up @@ -105,7 +105,12 @@

desc('Execute artisan optimize');
task('artisan:optimize', function () {
run('{{bin/php}} {{release_path}}/artisan optimize');
$deprecatedVersion = 5.5;
$currentVersion = get('laravel_version');

if (version_compare($currentVersion, $deprecatedVersion, '<')) {
run('{{bin/php}} {{release_path}}/artisan optimize');
}
});

desc('Execute artisan queue:restart');
Expand Down