Merge remote-tracking branch 'origin/master' into beta

Author: fgreinacher

lib/fail.js

@@ -24,12 +24,16 @@ export default async (pluginConfig, context) => {
     labels,
     assignee,
     retryLimit,
+    retryStatusCodes,
   } = resolveConfig(pluginConfig, context);
   const { encodedProjectPath, projectApiUrl } = getProjectContext(context, gitlabUrl, gitlabApiUrl, repositoryUrl);
 
   const apiOptions = {
     headers: { "PRIVATE-TOKEN": gitlabToken },
-    retry: { limit: retryLimit },
+    retry: {
+      limit: retryLimit,
+      statusCodes: retryStatusCodes,
+    },
   };
 
   if (failComment === false || failTitle === false) {

lib/publish.js

@@ -22,8 +22,17 @@ export default async (pluginConfig, context) => {
     nextRelease: { gitTag, gitHead, notes, version },
     logger,
   } = context;
-  const { gitlabToken, gitlabUrl, gitlabApiUrl, assets, milestones, proxy, retryLimit, publishToCatalog } =
-    resolveConfig(pluginConfig, context);
+  const {
+    gitlabToken,
+    gitlabUrl,
+    gitlabApiUrl,
+    assets,
+    milestones,
+    proxy,
+    retryLimit,
+    retryStatusCodes,
+    publishToCatalog,
+  } = resolveConfig(pluginConfig, context);
   const assetsList = [];
   const { projectPath, projectApiUrl } = getProjectContext(context, gitlabUrl, gitlabApiUrl, repositoryUrl);
 
@@ -45,7 +54,7 @@ export default async (pluginConfig, context) => {
         },
       ],
     },
-    retry: { limit: retryLimit },
+    retry: { limit: retryLimit, statusCodes: retryStatusCodes },
   };
 
   debug("projectPath: %o", projectPath);

lib/resolve-config.js

@@ -37,6 +37,9 @@ export default (
   }
 ) => {
   const DEFAULT_RETRY_LIMIT = 3;
+  // Added 422 to fix #839
+  // https://github.com/sindresorhus/got/blob/a359bd385129d2adbc765b52dfbbadac5f54a825/documentation/7-retry.md#retry
+  const DEFAULT_RETRY_STATUS_CODES = [408, 413, 422, 429, 500, 502, 503, 504, 521, 522, 524];
   const userGitlabApiPathPrefix = isNil(gitlabApiPathPrefix)
     ? isNil(GL_PREFIX)
       ? GITLAB_PREFIX
@@ -68,6 +71,7 @@ export default (
     labels: isNil(labels) ? "semantic-release" : labels === false ? false : labels,
     assignee,
     retryLimit: retryLimit ?? DEFAULT_RETRY_LIMIT,
+    retryStatusCodes: DEFAULT_RETRY_STATUS_CODES,
     publishToCatalog: publishToCatalog ?? false,
   };
 };

lib/success.js

@@ -15,12 +15,20 @@ export default async (pluginConfig, context) => {
     commits,
     releases,
   } = context;
-  const { gitlabToken, gitlabUrl, gitlabApiUrl, successComment, successCommentCondition, proxy, retryLimit } =
-    resolveConfig(pluginConfig, context);
+  const {
+    gitlabToken,
+    gitlabUrl,
+    gitlabApiUrl,
+    successComment,
+    successCommentCondition,
+    proxy,
+    retryLimit,
+    retryStatusCodes,
+  } = resolveConfig(pluginConfig, context);
   const { projectApiUrl } = getProjectContext(context, gitlabUrl, gitlabApiUrl, repositoryUrl);
   const apiOptions = {
     headers: { "PRIVATE-TOKEN": gitlabToken },
-    retry: { limit: retryLimit },
+    retry: { limit: retryLimit, statusCodes: retryStatusCodes },
   };
 
   if (successComment === false) {

package-lock.json

@@ -33,11 +33,11 @@
     "url-join": "^4.0.0"
   },
   "devDependencies": {
-    "ava": "6.2.0",
+    "ava": "6.3.0",
     "c8": "10.1.3",
     "nock": "14.0.2",
     "prettier": "3.5.3",
-    "semantic-release": "24.2.3",
+    "semantic-release": "24.2.4",
     "sinon": "20.0.0",
     "tempy": "1.0.1",
     "testdouble": "^3.20.2"

package.json

@@ -18,6 +18,7 @@ const defaultOptions = {
   assignee: undefined,
   proxy: {},
   retryLimit: 3,
+  retryStatusCodes: [408, 413, 422, 429, 500, 502, 503, 504, 521, 522, 524],
   publishToCatalog: false,
 };