Merge pull request #138 from ByteInternet/feature/slack-include-branch-from-ci-envs

poespas · web-flow · commit 6249c2b1945d · 2025-03-24T13:41:34.000+01:00
Display appropiate branchname based on CI runner
diff --git a/src/Deployer/Task/Common/DefaultsTaskGlobal.php b/src/Deployer/Task/Common/DefaultsTaskGlobal.php
@@ -8,6 +8,7 @@
 use Hypernode\Deploy\Stdlib\CpuCoreInfo;
 use Hypernode\Deploy\Stdlib\ReleaseInfo;
 use Hypernode\DeployConfiguration\Configuration;
+use Hypernode\Deploy\Stdlib\TargetFinder;
 
 use function Deployer\set;
 
@@ -23,10 +24,16 @@ class DefaultsTaskGlobal extends TaskBase
      */
     private $releaseInfo;
 
-    public function __construct(CpuCoreInfo $cpuInfo, ReleaseInfo $releaseInfo)
+    /**
+     * @var TargetFinder
+     */
+    private $targetFinder;
+
+    public function __construct(CpuCoreInfo $cpuInfo, ReleaseInfo $releaseInfo, TargetFinder $targetFinder)
     {
         $this->cpuInfo = $cpuInfo;
         $this->releaseInfo = $releaseInfo;
+        $this->targetFinder = $targetFinder;
     }
 
     public function configure(Configuration $config): void
@@ -41,6 +48,10 @@ public function configure(Configuration $config): void
             return $this->releaseInfo->getMessage();
         });
 
+        set('target', function () {
+            return $this->targetFinder->getTarget();
+        });
+
         set('commit_sha', function () {
             try {
                 return $this->releaseInfo->getCommitSha();
diff --git a/src/Stdlib/ReleaseInfo.php b/src/Stdlib/ReleaseInfo.php
@@ -25,8 +25,8 @@ public function getCommitSha(): string
     public function getMessage(): string
     {
         $body = [];
-        $body[] = parse('Successful deployment to **{{stage}}**');
-        $body[] = parse('Branch: `{{branch}}`');
+        $body[] = parse('Successful deployment to *{{stage}}*');
+        $body[] = parse('Branch: `{{target}}`');
         $body[] = parse('User: `{{user}}`');
         $body[] = parse('Commit: `{{commit_sha}}`');
 
@@ -40,7 +40,7 @@ public function getMessage(): string
         }
 
         $body[] = '';
-        $body[] = '**Servers:**';
+        $body[] = '*Servers:*';
         foreach ($this->getServers() as $server) {
             $body[] = '- ' . $server;
         }
diff --git a/src/Stdlib/TargetFinder.php b/src/Stdlib/TargetFinder.php
@@ -0,0 +1,74 @@
+<?php
+
+namespace Hypernode\Deploy\Stdlib;
+
+use function Deployer\get;
+
+class TargetFinder
+{
+    public function getTarget(): string
+    {
+        $branch = get('branch', 'HEAD');
+        if (!empty($branch) && $branch != 'HEAD') {
+            return $branch;
+        }
+
+        $branch = $this->getBranchFromCI();
+        if (!empty($branch)) {
+            return $branch;
+        }
+
+        return get('branch', 'HEAD');
+    }
+
+    private function getBranchFromCI(): ?string
+    {
+        // Check GitHub Actions
+        if ($githubBranch = getenv('GITHUB_HEAD_REF')) {
+            return $githubBranch;
+        }
+        if ($githubBaseRef = getenv('GITHUB_REF')) {
+            return $this->parseGithubRef($githubBaseRef);
+        }
+
+        // Check GitLab CI
+        if ($gitlabBranch = getenv('CI_COMMIT_REF_NAME')) {
+            return $gitlabBranch;
+        }
+
+        // Check Bitbucket Pipelines
+        if ($bitbucketBranch = getenv('BITBUCKET_BRANCH')) {
+            return $bitbucketBranch;
+        }
+
+        // Check Azure Pipelines
+        if ($azureBranch = getenv('BUILD_SOURCEBRANCH')) {
+            return $this->parseAzureBranch($azureBranch);
+        }
+
+        return null;
+    }
+
+    private function parseGithubRef(string $ref): ?string
+    {
+        // Extract branch or tag name from refs/heads/ or refs/tags/
+        if (preg_match('#refs/heads/(.+)#', $ref, $matches)) {
+            return $matches[1];
+        }
+        if (preg_match('#refs/tags/(.+)#', $ref, $matches)) {
+            return $matches[1];
+        }
+
+        return null;
+    }
+
+    private function parseAzureBranch(string $branch): ?string
+    {
+        // Extract branch name from refs/heads/
+        if (strpos($branch, 'refs/heads/') === 0) {
+            return substr($branch, strlen('refs/heads/'));
+        }
+
+        return $branch;
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ public function getCommitSha(): string`
`25`	`25`	`public function getMessage(): string`
`26`	`26`	`{`
`27`	`27`	`$body = [];`
`28`		`- $body[] = parse('Successful deployment to {{stage}}');`
`29`		- $body[] = parse('Branch: `{{branch}}`');
	`28`	`+ $body[] = parse('Successful deployment to {{stage}}');`
	`29`	+ $body[] = parse('Branch: `{{target}}`');
`30`	`30`	$body[] = parse('User: `{{user}}`');
`31`	`31`	$body[] = parse('Commit: `{{commit_sha}}`');
`32`	`32`
`@@ -40,7 +40,7 @@ public function getMessage(): string`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`$body[] = '';`
`43`		`- $body[] = 'Servers:';`
	`43`	`+ $body[] = 'Servers:';`
`44`	`44`	`foreach ($this->getServers() as $server) {`
`45`	`45`	`$body[] = '- ' . $server;`
`46`	`46`	`}`