Skip to content

Commit 729d278

Browse files
committed
Remove roles selector from builtin tasks
This was causing task with a certain selector always running. In the future, when we reiterate on Hypernode Deploy for clusters, we'll see what we really need and what's best to do. For now, it doesn't make sense to keep this in here.
1 parent e4e21c6 commit 729d278

File tree

9 files changed

+20
-55
lines changed

9 files changed

+20
-55
lines changed

src/DeployRunner.php

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
use Hypernode\Deploy\Exception\InvalidConfigurationException;
1515
use Hypernode\Deploy\Exception\TimeoutException;
1616
use Hypernode\Deploy\Exception\ValidationException;
17-
use Hypernode\DeployConfiguration\Configurable\ServerRoleConfigurableInterface;
18-
use Hypernode\DeployConfiguration\Configurable\StageConfigurableInterface;
1917
use Hypernode\DeployConfiguration\Configuration;
2018
use Hypernode\DeployConfiguration\Server;
2119
use Hypernode\DeployConfiguration\Stage;
@@ -135,7 +133,7 @@ private function prepare(bool $configureBuildStage, bool $configureServers, stri
135133
}
136134

137135
/**
138-
* Configure deploy tasks based on specific configuration in Hipex deploy configuration
136+
* Configure deploy tasks based on specific configuration in Hypernode Deploy configuration
139137
* @throws InvalidConfigurationException
140138
*/
141139
private function initializeConfigurableTask(ConfigurableTaskInterface $task, Configuration $mainConfig): void
@@ -146,20 +144,8 @@ private function initializeConfigurableTask(ConfigurableTaskInterface $task, Con
146144
);
147145

148146
foreach ($configurations as $taskConfig) {
149-
if (!$task->supports($taskConfig)) {
150-
continue;
151-
}
152-
153-
$deployerTask = $task->configureWithTaskConfig($taskConfig);
154-
if ($deployerTask) {
155-
if ($taskConfig instanceof StageConfigurableInterface && $taskConfig->getStage()) {
156-
$deployerTask->select("stage={$taskConfig->getStage()->getName()}");
157-
}
158-
159-
if ($taskConfig instanceof ServerRoleConfigurableInterface && $taskConfig->getServerRoles()) {
160-
$roles = implode("&", $taskConfig->getServerRoles());
161-
$deployerTask->select("roles={$roles}");
162-
}
147+
if ($task->supports($taskConfig)) {
148+
$task->configureWithTaskConfig($taskConfig);
163149
}
164150
}
165151
}

src/Deployer/Task/After/AfterTaskGlobal.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
namespace Hypernode\Deploy\Deployer\Task\After;
44

5-
use Hypernode\Deploy\Deployer\TaskBuilder;
65
use Hypernode\Deploy\Deployer\Task\TaskBase;
6+
use Hypernode\Deploy\Deployer\TaskBuilder;
77
use Hypernode\DeployConfiguration\Configuration;
8-
use Hypernode\DeployConfiguration\ServerRole;
98

109
use function count;
1110
use function Deployer\task;
@@ -32,9 +31,6 @@ public function configure(Configuration $config): void
3231
};
3332
}
3433

35-
$role = ServerRole::APPLICATION;
36-
task('deploy:after', $tasks)
37-
->once()
38-
->select("roles=$role");
34+
task('deploy:after', $tasks)->once();
3935
}
4036
}

src/Deployer/Task/After/CachetoolTask.php

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
namespace Hypernode\Deploy\Deployer\Task\After;
44

55
use Hypernode\Deploy\Deployer\Task\TaskBase;
6-
use Hypernode\DeployConfiguration\ServerRole;
7-
use Hypernode\Deploy\Deployer\Task\TaskInterface;
86
use Hypernode\DeployConfiguration\Configuration;
97

108
use function Deployer\after;
@@ -57,7 +55,7 @@ public function configure(Configuration $config): void
5755
run('curl -L -o cachetool.phar ' . $this->getCachetoolUrl());
5856
$cachetoolBinary = '{{release_path}}/cachetool.phar';
5957

60-
writeln(sprintf("Downloaded cachetool %s for PHP %d", $cachetoolBinary, $this->getPhpVersion()));
58+
writeln(sprintf("Downloaded cachetool %s for PHP %f", $cachetoolBinary, $this->getPhpVersion()));
6159
return $cachetoolBinary;
6260
});
6361
return $cachetoolBinary;
@@ -98,14 +96,11 @@ public function configure(Configuration $config): void
9896
run("cd {{release_path}} && {{bin/php}} {{bin/cachetool}} apcu:cache:clear {{cachetool_options}}");
9997
});
10098

101-
102-
$role = ServerRole::APPLICATION;
103-
task('cachetool:clear:opcache')
104-
->select("roles=$role");
99+
task('cachetool:clear:opcache');
105100

106101
task('cachetool:cleanup', function () {
107102
run('cd {{deploy_path}} && rm -f current/{{bin/cachetool}}');
108-
})->select("roles=$role");
103+
});
109104
}
110105

111106
protected function getPhpVersion(): float
@@ -121,7 +116,7 @@ public function getCachetoolUrl(): string
121116
}
122117

123118
if ($phpVersion >= 7.3) {
124-
return $this->versionBinaryMapping[6];
119+
return $this->versionBinaryMapping[7];
125120
}
126121

127122
if ($phpVersion >= 7.2) {

src/Deployer/Task/Deploy/CopyTask.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use Hypernode\Deploy\Deployer\Task\TaskBase;
66
use Hypernode\DeployConfiguration\Configuration;
7-
use Hypernode\DeployConfiguration\ServerRole;
87

98
use function Deployer\run;
109
use function Deployer\task;
@@ -14,19 +13,18 @@ class CopyTask extends TaskBase
1413
{
1514
public function configure(Configuration $config): void
1615
{
17-
$role = ServerRole::APPLICATION;
1816
task('deploy:copy:code', function () use ($config) {
1917
$packageFilepath = $config->getBuildArchiveFile();
2018
$packageFilename = pathinfo($packageFilepath, PATHINFO_BASENAME);
2119

2220
upload($packageFilepath, '{{release_path}}');
2321
run('cd {{release_path}} && tar -xf ' . $packageFilename);
2422
run('cd {{release_path}} && rm -f ' . $packageFilename);
25-
})->select("roles=$role");
23+
});
2624

2725
task('deploy:copy', [
2826
'deploy:copy:code',
2927
'deploy:shared',
30-
])->select("roles=$role");
28+
]);
3129
}
3230
}

src/Deployer/Task/Deploy/DeployTask.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
namespace Hypernode\Deploy\Deployer\Task\Deploy;
44

5-
use Hypernode\Deploy\Deployer\Task\TaskBase;
6-
use Hypernode\DeployConfiguration\ServerRole;
75
use Hypernode\Deploy\Deployer\RecipeLoader;
6+
use Hypernode\Deploy\Deployer\Task\TaskBase;
87
use Hypernode\DeployConfiguration\Configuration;
98

109
use function Deployer\fail;
@@ -25,13 +24,12 @@ public function __construct(RecipeLoader $loader)
2524
public function configure(Configuration $config): void
2625
{
2726
$this->loader->load('deploy/info.php');
28-
$role = ServerRole::APPLICATION;
2927

3028
task('deploy', [
3129
'deploy:upload',
3230
'deploy:link',
3331
'deploy:finalize',
34-
])->select("roles=$role");
32+
]);
3533

3634
fail('deploy', 'deploy:failed');
3735
}

src/Deployer/Task/Deploy/DeployTaskGlobal.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use Hypernode\Deploy\Deployer\Task\TaskBase;
66
use Hypernode\DeployConfiguration\Configuration;
7-
use Hypernode\DeployConfiguration\ServerRole;
87

98
use function Deployer\task;
109
use function Hypernode\Deploy\Deployer\noop;
@@ -14,14 +13,13 @@ class DeployTaskGlobal extends TaskBase
1413
public function configure(Configuration $config): void
1514
{
1615
$tasks = $config->getDeployTasks();
17-
$role = ServerRole::APPLICATION;
1816

1917
if (count($tasks)) {
2018
task('deploy:deploy', $tasks);
2119
} else {
2220
task('deploy:deploy', noop());
2321
}
2422

25-
task('deploy:deploy', $tasks)->select("roles=$role");
23+
task('deploy:deploy', $tasks);
2624
}
2725
}

src/Deployer/Task/Deploy/FinalizeTask.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
namespace Hypernode\Deploy\Deployer\Task\Deploy;
44

5-
use Hypernode\Deploy\Deployer\Task\TaskBase;
6-
use Hypernode\DeployConfiguration\ServerRole;
75
use Hypernode\Deploy\Deployer\RecipeLoader;
6+
use Hypernode\Deploy\Deployer\Task\TaskBase;
87
use Hypernode\DeployConfiguration\Configuration;
98

109
use function Deployer\after;
@@ -26,14 +25,13 @@ public function __construct(RecipeLoader $loader)
2625
public function configure(Configuration $config): void
2726
{
2827
$this->loader->load('deploy/info.php');
29-
$role = ServerRole::APPLICATION;
3028

3129
task('deploy:finalize', [
3230
'deploy:after',
3331
'deploy:unlock',
3432
'deploy:cleanup',
3533
'deploy:success',
36-
])->select("roles=$role");
34+
]);
3735

3836
fail('deploy', 'deploy:failed');
3937
after('deploy:failed', 'deploy:unlock');

src/Deployer/Task/Deploy/LinkTask.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
use Hypernode\Deploy\Deployer\Task\TaskBase;
66
use Hypernode\DeployConfiguration\Configuration;
7-
use Hypernode\DeployConfiguration\ServerRole;
87

98
use function Deployer\run;
109
use function Deployer\task;
@@ -14,11 +13,10 @@ class LinkTask extends TaskBase
1413
{
1514
public function configure(Configuration $config): void
1615
{
17-
$role = ServerRole::APPLICATION;
1816
task('deploy:link', [
1917
'deploy:symlink',
2018
'deploy:public_link',
21-
])->select("roles=$role");
19+
]);
2220

2321
// Symlink public_html folder
2422
task('deploy:public_link', function () {
@@ -33,6 +31,6 @@ public function configure(Configuration $config): void
3331
} else {
3432
run('ln -s {{current_path}}/{{public_folder}} /data/web/public');
3533
}
36-
})->select("roles=$role");
34+
});
3735
}
3836
}

src/Deployer/Task/Deploy/UploadTask.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
namespace Hypernode\Deploy\Deployer\Task\Deploy;
44

5-
use Hypernode\Deploy\Deployer\Task\TaskBase;
6-
use Hypernode\DeployConfiguration\ServerRole;
75
use Hypernode\Deploy\Deployer\RecipeLoader;
6+
use Hypernode\Deploy\Deployer\Task\TaskBase;
87
use Hypernode\DeployConfiguration\Configuration;
98

109
use function Deployer\fail;
@@ -25,15 +24,14 @@ public function __construct(RecipeLoader $loader)
2524
public function configure(Configuration $config): void
2625
{
2726
$this->loader->load('deploy/info.php');
28-
$role = ServerRole::APPLICATION;
2927

3028
task('deploy:upload', [
3129
'deploy:info',
3230
'prepare:ssh',
3331
'deploy:prepare',
3432
'deploy:copy',
3533
'deploy:deploy',
36-
])->select("roles=$role");
34+
]);
3735

3836
fail('deploy', 'deploy:failed');
3937
}

0 commit comments

Comments
 (0)