Merge pull request #224 from SableClient/fix/knope-ci

fix: knope ci

Author: hazre

.changeset/feat-group-dm-triangle-avatars.md

@@ -1,5 +1,5 @@
 ---
-'default': minor
+default: minor
 ---
 
 Show group DM participants with triangle avatar layout. Group DMs now display up to 3 member avatars in a triangle formation (most recent sender on top), with bot filtering and DM count badge support.

.github/workflows/prepare-release.yml

@@ -18,7 +18,6 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: true
-          token: ${{ secrets.RELEASE_PAT }}
 
       - uses: fregante/setup-git-user@024bc0b8e177d7e77203b48dab6fb45666854b35 # v2.0.2
 
@@ -28,62 +27,91 @@ jobs:
 
       - name: Prepare Release
         run: knope prepare-release --verbose
-        continue-on-error: true
         env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_PAT }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Enrich changelog with PR attribution
+      - name: Enrich changelog and update release PR
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
             const fs = require("fs");
-            const changelog = "CHANGELOG.md";
-
-            if (!fs.existsSync(changelog)) return;
-
-            let content = fs.readFileSync(changelog, "utf8");
-            const marker = /<!-- commit:([0-9a-f]+) -->/g;
-            const hashes = [...new Set([...content.matchAll(marker)].map(m => m[1]))];
-
-            if (hashes.length === 0) return;
-
             const { owner, repo } = context.repo;
 
-            for (const hash of hashes) {
-              let replacement = "";
+            async function resolveHash(hash) {
               try {
-                // Find PRs associated with this commit. Knope uses the commit that
-                // first introduced the changeset file, so this reliably points to
-                // the original PR regardless of later edits on the branch.
                 const prs = await github.rest.repos.listPullRequestsAssociatedWithCommit({
                   owner, repo, commit_sha: hash,
                 });
                 const pr = prs.data[0];
-                if (pr) {
-                  const isInternal = pr.labels.some(label => label.name.toLowerCase() === 'internal');
-                  if (isInternal) {
-                    const lineRegex = new RegExp(`^.*.*\\r?\\n?`, 'gm');
-                    content = content.replace(lineRegex, '');
-                    continue; 
-                  }
-                  replacement = `([#${pr.number}](${pr.html_url}) by @${pr.user.login})`;
-                } else {
-                  // Commit exists but has no associated PR (e.g. direct push to dev)
-                  replacement = `(\`${hash}\`)`;
-                }
+                return pr
+                  ? `([#${pr.number}](${pr.html_url}) by @${pr.user.login})`
+                  : `(\`${hash}\`)`;
               } catch {
-                replacement = `(\`${hash}\`)`;
+                return `(\`${hash}\`)`;
+              }
+            }
+
+            async function enrichText(text) {
+              const marker = /<!-- commit:([0-9a-f]+) -->/g;
+              const hashes = [...new Set([...text.matchAll(marker)].map(m => m[1]))];
+              for (const hash of hashes) {
+                text = text.replaceAll(`<!-- commit:${hash} -->`, await resolveHash(hash));
+              }
+              return text;
+            }
+
+            const changelog = "CHANGELOG.md";
+            if (fs.existsSync(changelog)) {
+              const enriched = await enrichText(fs.readFileSync(changelog, "utf8"));
+              fs.writeFileSync(changelog, enriched);
+            }
+
+            const prs = await github.rest.pulls.list({
+              owner, repo,
+              head: `${owner}:release`,
+              state: "open",
+            });
+
+            if (prs.data.length === 0) {
+              core.warning("No open PR found for the release branch.");
+              return;
+            }
+
+            const pr = prs.data[0];
+
+            const label = "internal";
+            try {
+              await github.rest.issues.getLabel({ owner, repo, name: label });
+            } catch (e) {
+              if (e.status === 404) {
+                await github.rest.issues.createLabel({ owner, repo, name: label, color: "e4e669" });
+              } else {
+                throw e;
               }
-              content = content.replaceAll(`<!-- commit:${hash} -->`, replacement);
             }
 
-            fs.writeFileSync(changelog, content);
+            await Promise.all([
+              github.rest.pulls.update({
+                owner, repo,
+                pull_number: pr.number,
+                body: await enrichText(pr.body ?? ""),
+              }),
+              github.rest.issues.addLabels({
+                owner, repo,
+                issue_number: pr.number,
+                labels: [label],
+              }),
+            ]);
 
       - name: Amend release commit with enriched changelog
         shell: bash
         run: |
-          # Only amend if the changelog was actually staged by knope
+          if [[ "$(git rev-parse --abbrev-ref HEAD)" != "release" ]]; then
+            echo "Not on release branch — skipping amend."
+            exit 1
+          fi
+
           if git diff --cached --name-only | grep -q "CHANGELOG.md"; then
             git add CHANGELOG.md
             git commit --amend --no-edit

.github/workflows/release.yml

@@ -18,7 +18,6 @@ jobs:
         with:
           fetch-depth: 0
           persist-credentials: false
-          ref: ${{ github.base_ref }}
 
       - uses: knope-dev/action@19617851f9f13ab2f27a05989c55efb18aca3675 # v2.1.2
         with:
@@ -27,4 +26,4 @@ jobs:
       - name: Create Release
         run: knope release --verbose
         env:
-          GITHUB_TOKEN: ${{ secrets.RELEASE_PAT }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}