Merge branch 'master' into update-framework-readme-contribution-section

hydephp · Oct 30, 2023 · 3155033 · 3155033
2 parents e39b0c9 + 16a1cb5
commit 3155033
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/monorepo/DevTools/src/MonorepoReleaseCommand.php b/monorepo/DevTools/src/MonorepoReleaseCommand.php
@@ -307,7 +307,7 @@ protected function makeMonorepoCommit(): void
         $this->output->write('Committing framework version change... ');
 
         $this->runUnlessDryRun('git add .', true);
-        $this->runUnlessDryRun('git commit -m "Version v'.$this->newVersion.'"');
+        $this->runUnlessDryRun('git commit -m "HydePHP v'.$this->newVersion.' - '.date('Y-m-d').'"');
 
         $this->exitIfFailed();
 
@@ -326,7 +326,7 @@ protected function prepareHydePR(): void
 
     protected function prepareDocsPR(): void
     {
-        $this->preparePackagePR('hyde', 'upcoming', 'Merge upcoming documentation', 'This PR merges the upcoming documentation for v'.$this->newVersion.' into the master branch.');
+        $this->preparePackagePR('hydephp.com', 'upcoming', 'Merge upcoming documentation', 'This PR merges the upcoming documentation for `v'.$this->newVersion.'` into the master branch.');
     }
 
     protected function getTitle(): string
@@ -354,11 +354,13 @@ protected function preparePackagePR(string $package, string $branch = 'develop',
 
     protected function prepareMonorepoPR(): void
     {
-        $title = $this->isPatch()
-            ? "Framework version v$this->newVersion"
-            : "HydePHP v$this->newVersion - ".date('Y-m-d');
-
-        $body = $this->releaseBody;
+        if ($this->isPatch()) {
+            $title = "Framework version v$this->newVersion";
+            $body = '';
+        } else {
+            $title = "HydePHP v$this->newVersion - ".date('Y-m-d');
+            $body = $this->releaseBody;
+        }
 
         // Inject "version" before version in PR body
         $body = preg_replace('/## \[(.*)]/', '## Version [v$1]', $body, 1);