Merge pull request #201 from wikando-ck/feat/multi-directory-working-dirs

feat: add working directory to comment locator for monorepo support

Author: WyriHaximus

generate-comments/comment.php

@@ -4,7 +4,9 @@
 
 $diff = file_get_contents('/workdir/' . $argv[1] . '.md');
 $prNumber = json_decode(file_get_contents(getenv('GITHUB_EVENT_PATH')), true)['pull_request']['number'];
-$locator = '<!-- @)}---^----- wyrihaximus/github-action-composer.lock-diff ' . getenv('GITHUB_WORKFLOW') . ' __/<+>\__ ' . $argv[1] . ' -----^---{(@ -->';
+$workingDirectory = getenv('INPUT_WORKINGDIRECTORY') ?: '/';
+$locator = '<!-- @)}---^----- wyrihaximus/github-action-composer.lock-diff ' . getenv('GITHUB_WORKFLOW') . ' __/<+>\__ ' . $argv[1] . ' __/<*>\__ ' . $workingDirectory . ' -----^---{(@ -->';
+$legacyLocator = '<!-- @)}---^----- wyrihaximus/github-action-composer.lock-diff ' . getenv('GITHUB_WORKFLOW') . ' __/<+>\__ ' . $argv[1] . ' -----^---{(@ -->';
 $commentContents = $locator . PHP_EOL . $argv[2] . PHP_EOL . $diff . PHP_EOL;
 
 $client = new GuzzleHttp\Client();
@@ -17,7 +19,9 @@
 $comments = json_decode($res->getBody()->getContents(), true);
 
 foreach ($comments as $comment) {
-    if (strpos($comment['body'], $locator) === 0) {
+    $isCurrentLocator = strpos($comment['body'], $locator) === 0;
+    $isLegacyLocator = !$isCurrentLocator && !getenv('INPUT_WORKINGDIRECTORY') && strpos($comment['body'], $legacyLocator) === 0;
+    if ($isCurrentLocator || $isLegacyLocator) {
         if (strlen($diff) === 0) {
             echo 'Deleting ', $argv[1], ' comment', PHP_EOL;
             $client->request('DELETE', 'https://api.github.com/repos/' . getenv('GITHUB_REPOSITORY') . '/issues/comments/' . $comment['id'], [

generate-comments/entrypoint.sh

@@ -45,8 +45,13 @@ echo "${delimiter}" >> "${GITHUB_OUTPUT}"
 if [ "$INPUT_DRYRUN" != "yes" ]
 then
   echo "Not in a dry run so upserting comments when desirable"
-  php /workdir/comment.php production "🏰 Composer Production Dependency changes 🏰"
-  php /workdir/comment.php development "🚧 Composer Development Dependency changes 🚧"
+  if [ -n "${workingDirectory}" ]; then
+    directoryLabel=" (${workingDirectory%/})"
+  else
+    directoryLabel=""
+  fi
+  php /workdir/comment.php production "🏰 Composer Production Dependency changes${directoryLabel} 🏰"
+  php /workdir/comment.php development "🚧 Composer Development Dependency changes${directoryLabel} 🚧"
 else
   echo "In a dry run so not upserting comments when desirable"
 fi