Skip to content

Feature/fix slack tasks #129

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

Closed
poespas wants to merge 4 commits into from
Closed

Feature/fix slack tasks #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3bd6da
IMP: Make SlackNotifications compatible again
Jan 7, 2025
e7506e1
Add additional checks for git changes in release notes
Jan 7, 2025
1364fab
Fix grumPHP
Jan 7, 2025
ad34d12
Fix grumphp
Jan 7, 2025
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
4 changes: 4 additions & 0 deletions src/Bootstrap.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ private function initContainer(): Container
'version' => $this->getVersion(),
]);

if (!defined('DEPLOYER_VERSION')) {
define("DEPLOYER_VERSION", sprintf("Hypernode Deploy %s", $this->getVersion()));
}

$container = $builder->build();

$this->registerTwigLoader($container);
Expand Down
1 change: 1 addition & 0 deletions src/DeployRunner.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ private function configureStageServer(
$host->setSshMultiplexing(true);
$host->set('roles', $server->getRoles());
$host->set('domain', $stage->getDomain());
$host->set('stage', $stage->getName());
$host->set('deploy_path', function () {
// Ensure directory exists before returning it
run('mkdir -p ~/apps/{{domain}}/shared');
Expand Down
2 changes: 1 addition & 1 deletion src/Deployer/Task/After/SlackTask.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public function supports(TaskConfigurationInterface $config): bool
*/
public function configureWithTaskConfig(TaskConfigurationInterface $config): ?Task
{
$this->recipeLoader->load('slack.php');
$this->recipeLoader->load('../contrib/slack.php');
Copy link
Collaborator Author

@poespas poespas Jan 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm thinking it moved in a more recent Deployer version?


set('slack_webhook', $config->getWebHook());
set('slack_text', '{{release_message}}');
Expand Down
13 changes: 11 additions & 2 deletions src/Stdlib/ReleaseInfo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace Hypernode\Deploy\Stdlib;

use Hypernode\DeployConfiguration\Stage;
use Deployer\Exception\RunException;

use function Deployer\get;
use function Deployer\parse;
Expand All @@ -18,7 +19,11 @@ class ReleaseInfo

public function getCommitSha(): string
{
return runLocally('git rev-parse HEAD');
try {
Copy link
Collaborator Author

@poespas poespas Jan 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In case it's not ran in a git folder

return runLocally('git rev-parse HEAD');
} catch (\Throwable $e) {
return '';
}
}

public function getMessage(): string
Expand Down Expand Up @@ -52,7 +57,11 @@ public function getMessage(): string
*/
private function branchList(): array
{
$gitLogOutput = runLocally('git log --merges -n 1');
$gitLogOutput = '';
try {
$gitLogOutput = runLocally('git log --merges -n 1');
} catch (RunException $e) {
}

if (!preg_match(self::MERGE_PATTERN, $gitLogOutput, $matches)) {
output()->write('No merge commit found');
Expand Down
Loading