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

[1.x] Fixes missing version option #482

Merged
merged 3 commits into from
Feb 21, 2022
Merged

[1.x] Fixes missing version option #482

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
4d53e1f
Fixes missing `version` option
nunomaduro Feb 21, 2022
a395c10
Bumps `spiral/roadrunner` on composer too
nunomaduro Feb 21, 2022
a39a06d
Ignores message
nunomaduro Feb 21, 2022
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
2 changes: 1 addition & 1 deletion composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"nunomaduro/collision": "^5.10|^6.0",
"orchestra/testbench": "^6.16|^7.0",
"phpunit/phpunit": "^9.3",
"spiral/roadrunner": "^2.0"
"spiral/roadrunner": "^2.8.2"
},
"bin": [
"bin/roadrunner-worker",
Expand Down
6 changes: 3 additions & 3 deletions src/Commands/Concerns/InstallsRoadRunnerDependencies.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ trait InstallsRoadRunnerDependencies
*
* @var string
*/
protected $requiredVersion = '2.6.6';
protected $requiredVersion = '2.8.2';

/**
* Determine if RoadRunner is installed.
Expand All @@ -44,13 +44,13 @@ protected function ensureRoadRunnerPackageIsInstalled()
return true;
}

if (! $this->confirm('Octane requires "spiral/roadrunner:^2.0". Do you wish to install it as a dependency?')) {
if (! $this->confirm('Octane requires "spiral/roadrunner:^2.8.2". Do you wish to install it as a dependency?')) {
$this->error('Octane requires "spiral/roadrunner".');

return false;
}

$command = $this->findComposer().' require spiral/roadrunner:^2.0 --with-all-dependencies';
$command = $this->findComposer().' require spiral/roadrunner:^2.8.2 --with-all-dependencies';

$process = Process::fromShellCommandline($command, null, null, null, null);

Expand Down
1 change: 1 addition & 0 deletions src/Commands/Concerns/InteractsWithIO.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ trait InteractsWithIO
'stop signal received, grace timeout is: ',
'exit forced',
'worker allocated',
'worker is allocated',
'worker constructed',
'worker destructed',
'[INFO] RoadRunner server started; version:',
Expand Down
1 change: 1 addition & 0 deletions src/Commands/StartRoadRunnerCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public function handle(ServerProcessInspector $inspector, ServerStateFile $serve
$server = tap(new Process(array_filter([
$roadRunnerBinary,
'-c', $this->configPath(),
'-o', 'version=2.7',
'-o', 'http.address='.$this->option('host').':'.$this->option('port'),
'-o', 'server.command='.(new PhpExecutableFinder)->find().' '.base_path('vendor/bin/roadrunner-worker'),
'-o', 'http.pool.num_workers='.$this->workerCount(),
Expand Down