Merge beta to master

README.md

@@ -96,6 +96,7 @@ If you need to bypass the proxy for some hosts, configure the `NO_PROXY` environ
 | `labels`                  | The [labels](https://docs.gitlab.com/ee/user/project/labels.html#labels) to add to the issue created when a release fails. Set to `false` to not add any label. Labels should be comma-separated as described in the [official docs](https://docs.gitlab.com/ee/api/issues.html#new-issue), e.g. `"semantic-release,bot"`. | `semantic-release`                                                                                                                                                      |
 | `assignee`                | The [assignee](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#assignee) to add to the issue created when a release fails.                                                                                                                                                                             | -                                                                                                                                                                       |
 | `retryLimit`              | The maximum number of retries for failing HTTP requests.                                                                                                                                                                                                                                                                   | `3`                                                                                                                                                                     |
+| `publishToCatalog`        | [EXPERIMENTAL] Publishes CI/CD components to the catalog. See [publishToCatalog](#publishToCatalog).                                                                                                                                                                                                                       | `false`                                                                                                                                                                 |
 
 #### assets
 
@@ -211,6 +212,14 @@ The fail comment condition is generated with [Lodash template](https://lodash.co
 
 > check the [GitLab API Issue object](https://docs.gitlab.com/ee/api/issues.html#single-issue) for properties which can be used for the filter
 
+#### publishToCatalog
+
+**Note**: This is an EXPERIMENTAL option that might change in the future.
+
+Use this option to [publish CI/CD components to the catalog](https://gitlab.com/gitlab-org/cli/-/blob/main/docs/source/repo/publish/catalog.md) as part of the release process.
+
+The publishing is done via the `glab` CLI, so make sure to [install it before](https://gitlab.com/gitlab-org/cli#installation).
+
 ## Compatibility
 
 The latest version of this plugin is compatible with all currently-supported versions of GitLab, [which is the current major version and previous two major versions](https://about.gitlab.com/support/statement-of-support.html#version-support). This plugin is not guaranteed to work with unsupported versions of GitLab.

lib/definitions/errors.js

@@ -87,4 +87,8 @@ Please make sure the GitLab user associated with the token has the [permission t
 
 Please make sure to create a [GitLab personal access token](https://docs.gitlab.com/ce/user/profile/personal_access_tokens.html) and to set it in the \`GL_TOKEN\` or \`GITLAB_TOKEN\` environment variable on your CI environment. The token must allow to push to the repository ${repositoryUrl}.`,
   }),
+  EGLABNOTINSTALLED: () => ({
+    message: 'GitLab CLI not installed.',
+    details: 'The [GitLab CLI needs to be installed](https://gitlab.com/gitlab-org/cli#installation) so that the project\'s CI components can be published.',
+  }),
 };

lib/glab.js

@@ -0,0 +1,5 @@
+import { execa } from "execa";
+
+export default async (args, options) => {
+  return execa("glab", args, options);
+};

lib/publish.js

@@ -12,7 +12,7 @@ import resolveConfig from "./resolve-config.js";
 import getAssets from "./glob-assets.js";
 import { RELEASE_NAME } from "./definitions/constants.js";
 import getProjectContext from "./get-project-context.js";
-
+import glab from "./glab.js";
 const isUrlScheme = (value) => /^(https|http|ftp):\/\//.test(value);
 
 export default async (pluginConfig, context) => {
@@ -22,17 +22,24 @@ export default async (pluginConfig, context) => {
     nextRelease: { gitTag, gitHead, notes, version },
     logger,
   } = context;
-  const { gitlabToken, gitlabUrl, gitlabApiUrl, assets, milestones, proxy, retryLimit, retryStatusCodes } =
-    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);
 
   const encodedGitTag = encodeURIComponent(gitTag);
   const encodedVersion = encodeURIComponent(version);
   const apiOptions = {
-    headers: {
-      "PRIVATE-TOKEN": gitlabToken,
-    },
+    headers: { "PRIVATE-TOKEN": gitlabToken },
     hooks: {
       beforeError: [
         (error) => {
@@ -185,11 +192,7 @@ export default async (pluginConfig, context) => {
   debug("POST-ing the following JSON to %s:\n%s", createReleaseEndpoint, JSON.stringify(json, null, 2));
 
   try {
-    await got.post(createReleaseEndpoint, {
-      ...apiOptions,
-      ...proxy,
-      json,
-    });
+    await got.post(createReleaseEndpoint, { ...apiOptions, ...proxy, json });
   } catch (error) {
     logger.error("An error occurred while making a request to the GitLab release API:\n%O", error);
     throw error;
@@ -199,5 +202,19 @@ export default async (pluginConfig, context) => {
 
   const releaseUrl = urlJoin(gitlabUrl, projectPath, `/-/releases/${encodedGitTag}`);
 
+  if (publishToCatalog) {
+    try {
+      await glab(["repo", "publish", "catalog", gitTag], {
+        cwd,
+        timeout: 30 * 1000,
+        env: { GITLAB_TOKEN: gitlabToken },
+      });
+      logger.log("Published tag %s to the CI catalog", gitTag);
+    } catch (error) {
+      logger.error("An error occurred while publishing tag %s to the CI catalog:\n%O", gitTag, error);
+      throw error;
+    }
+  }
+
   return { name: RELEASE_NAME, url: releaseUrl };
 };

lib/resolve-config.js

@@ -16,6 +16,7 @@ export default (
     labels,
     assignee,
     retryLimit,
+    publishToCatalog,
   },
   {
     envCi: { service } = {},
@@ -71,6 +72,7 @@ export default (
     assignee,
     retryLimit: retryLimit ?? DEFAULT_RETRY_LIMIT,
     retryStatusCodes: DEFAULT_RETRY_STATUS_CODES,
+    publishToCatalog: publishToCatalog ?? false,
   };
 };
 

lib/verify.js

@@ -30,7 +30,10 @@ export default async (pluginConfig, context) => {
     options: { repositoryUrl },
     logger,
   } = context;
-  const { gitlabToken, gitlabUrl, gitlabApiUrl, proxy, ...options } = resolveConfig(pluginConfig, context);
+  const { gitlabToken, gitlabUrl, gitlabApiUrl, proxy, publishToCatalog, ...options } = resolveConfig(
+    pluginConfig,
+    context
+  );
   const { projectPath, projectApiUrl } = getProjectContext(context, gitlabUrl, gitlabApiUrl, repositoryUrl);
 
   debug("apiUrl: %o", gitlabApiUrl);
@@ -89,6 +92,18 @@ export default async (pluginConfig, context) => {
     }
   }
 
+  if (publishToCatalog === true) {
+    try {
+      logger.log("Verifying that the GitLab CLI is installed");
+      await glab(["version"], {
+        timeout: 5 * 1000,
+      });
+    } catch (error) {
+      logger.error("The GitLab CLI is required but failed to run:\n%O", error);
+      errors.push(getError("EGLABNOTINSTALLED"));
+    }
+  }
+
   if (errors.length > 0) {
     throw new AggregateError(errors);
   }