Merge remote-tracking branch 'upstream/master'

Author: kristof-mattei

.github/workflows/release.yml

@@ -18,8 +18,8 @@ jobs:
     name: release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+      - uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           cache: npm
           node-version: lts/*

.github/workflows/test.yml

@@ -26,9 +26,9 @@ jobs:
           - ubuntu-latest
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - name: "Use Node.js ${{ matrix.node-version }}"
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version: "${{ matrix.node-version }}"
           cache: npm
@@ -42,11 +42,11 @@ jobs:
     timeout-minutes: 5
 
     steps:
-      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       - run: git config --global user.name github-actions
       - run: git config --global user.email github-actions@github.com
       - name: Use Node.js from .nvmrc
-        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
+        uses: actions/setup-node@39370e3970a6d050c480ffad4ff0ed4d3fdee5af # v4.1.0
         with:
           node-version-file: .nvmrc
           cache: npm

.nvmrc

@@ -1 +1 @@
-20
+22

README.md

@@ -1,3 +1,5 @@
 export const ISSUE_ID = "<!-- semantic-release:github -->";
 
 export const RELEASE_NAME = "GitHub release";
+
+export const RELEASE_FAIL_LABEL = "semantic-release";

lib/definitions/constants.js

@@ -139,6 +139,19 @@ By default the \`repositoryUrl\` option is retrieved from the \`repository\` pro
   };
 }
 
+export function EMISMATCHGITHUBURL({ repositoryUrl, clone_url }) {
+  return {
+    message: "The git repository URL mismatches the GitHub URL.",
+    details: `The **semantic-release** \`repositoryUrl\` option must have the same repository name and owner as the GitHub repo.
+
+Your configuration for the \`repositoryUrl\` option is \`${stringify(repositoryUrl)}\` and the \`clone_url\` of your GitHub repo is \`${stringify(clone_url)}\`.
+
+By default the \`repositoryUrl\` option is retrieved from the \`repository\` property of your \`package.json\` or the [git origin url](https://git-scm.com/book/en/v2/Git-Basics-Working-with-Remotes) of the repository cloned by your CI environment.
+
+Note: If you have recently changed your GitHub repository name or owner, update the value in **semantic-release** \`repositoryUrl\` option and the \`repository\` property of your \`package.json\` respectively to match the new GitHub URL.`,
+  };
+}
+
 export function EINVALIDPROXY({ proxy }) {
   return {
     message: "Invalid `proxy` option.",

lib/definitions/errors.js

@@ -2,7 +2,7 @@ import { template } from "lodash-es";
 import debugFactory from "debug";
 
 import parseGithubUrl from "./parse-github-url.js";
-import { ISSUE_ID } from "./definitions/constants.js";
+import { ISSUE_ID, RELEASE_FAIL_LABEL } from "./definitions/constants.js";
 import resolveConfig from "./resolve-config.js";
 import { toOctokitOptions } from "./octokit.js";
 import findSRIssues from "./find-sr-issues.js";
@@ -23,14 +23,20 @@ export default async function fail(pluginConfig, context, { Octokit }) {
     githubApiPathPrefix,
     githubApiUrl,
     proxy,
-    failComment,
     failTitle,
+    failComment,
+    failCommentCondition,
     labels,
     assignees,
   } = resolveConfig(pluginConfig, context);
 
   if (failComment === false || failTitle === false) {
     logger.log("Skip issue creation.");
+    logger.warn(
+      `DEPRECATION: 'false' for 'failComment' or 'failTitle' is deprecated and will be removed in a future major version. Use 'failCommentCondition' instead.`,
+    );
+  } else if (failCommentCondition === false) {
+    logger.log("Skip issue creation.");
   } else {
     const octokit = new Octokit(
       toOctokitOptions({
@@ -50,7 +56,23 @@ export default async function fail(pluginConfig, context, { Octokit }) {
     const body = failComment
       ? template(failComment)({ branch, errors })
       : getFailComment(branch, errors);
-    const [srIssue] = await findSRIssues(octokit, failTitle, owner, repo);
+    const [srIssue] = await findSRIssues(
+      octokit,
+      logger,
+      failTitle,
+      labels,
+      owner,
+      repo,
+    );
+
+    const canCommentOnOrCreateIssue = failCommentCondition
+      ? template(failCommentCondition)({ ...context, issue: srIssue })
+      : true;
+
+    if (!canCommentOnOrCreateIssue) {
+      logger.log("Skip commenting on or creating an issue.");
+      return;
+    }
 
     if (srIssue) {
       logger.log("Found existing semantic-release issue #%d.", srIssue.number);
@@ -69,7 +91,7 @@ export default async function fail(pluginConfig, context, { Octokit }) {
         repo,
         title: failTitle,
         body: `${body}\n\n${ISSUE_ID}`,
-        labels: labels || [],
+        labels: (labels || []).concat([RELEASE_FAIL_LABEL]),
         assignees,
       };
       debug("create issue: %O", newIssue);

lib/fail.js

@@ -1,11 +1,63 @@
-import { ISSUE_ID } from "./definitions/constants.js";
+import { uniqBy } from "lodash-es";
+import { ISSUE_ID, RELEASE_FAIL_LABEL } from "./definitions/constants.js";
+
+export default async (octokit, logger, title, labels, owner, repo) => {
+  let issues = [];
 
-export default async (octokit, title, owner, repo) => {
   const {
-    data: { items: issues },
-  } = await octokit.request("GET /search/issues", {
-    q: `in:title+repo:${owner}/${repo}+type:issue+state:open+${title}`,
+    repository: {
+      issues: { nodes: issueNodes },
+    },
+  } = await octokit.graphql(loadGetSRIssuesQuery, {
+    owner,
+    repo,
+    filter: {
+      labels: (labels || []).concat([RELEASE_FAIL_LABEL]),
+    },
   });
 
-  return issues.filter((issue) => issue.body && issue.body.includes(ISSUE_ID));
+  issues.push(...issueNodes);
+
+  /**
+   * BACKWARD COMPATIBILITY: Fallback to the search API if the issue was not found in the GraphQL response.
+   * This fallback will be removed in a future release
+   */
+  if (issueNodes.length === 0) {
+    try {
+      const {
+        data: { items: backwardIssues },
+      } = await octokit.request("GET /search/issues", {
+        q: `in:title+repo:${owner}/${repo}+type:issue+state:open+${title}`,
+      });
+      issues.push(...backwardIssues);
+    } catch (error) {
+      logger.log(
+        "An error occured fetching issue via fallback (with GH SearchAPI)",
+      );
+    }
+  }
+
+  const uniqueSRIssues = uniqBy(
+    issues.filter((issue) => issue.body && issue.body.includes(ISSUE_ID)),
+    "number",
+  );
+
+  return uniqueSRIssues;
 };
+
+/**
+ * GraphQL Query to et the semantic-release issues for a repository.
+ */
+const loadGetSRIssuesQuery = `#graphql
+  query getSRIssues($owner: String!, $repo: String!, $filter: IssueFilters) {
+    repository(owner: $owner, name: $repo) {
+      issues(first: 100, states: OPEN, filterBy: $filter) {
+        nodes {
+          number
+          title
+          body
+        }
+      }
+    }
+  }
+`;

lib/find-sr-issues.js

@@ -30,7 +30,6 @@ export default async function globAssets({ cwd }, assets) {
           const globbed = await globby(glob, {
             cwd,
             expandDirectories: false, // TODO Temporary workaround for https://github.com/mrmlnc/fast-glob/issues/47
-            gitignore: false,
             dot: true,
             onlyFiles: false,
           });

lib/glob-assets.js

@@ -8,8 +8,10 @@ export default function resolveConfig(
     proxy,
     assets,
     successComment,
+    successCommentCondition,
     failTitle,
     failComment,
+    failCommentCondition,
     labels,
     assignees,
     releasedLabels,
@@ -30,10 +32,12 @@ export default function resolveConfig(
     proxy: isNil(proxy) ? env.http_proxy || env.HTTP_PROXY || false : proxy,
     assets: assets ? castArray(assets) : assets,
     successComment,
+    successCommentCondition,
     failTitle: isNil(failTitle)
       ? "The automated release is failing 🚨"
       : failTitle,
     failComment,
+    failCommentCondition,
     labels: isNil(labels)
       ? ["semantic-release"]
       : labels === false