@catladder/cli 3.15.1 → 3.16.1

package/package.json

@@ -53,7 +53,7 @@
     }
   ],
   "license": "MIT",
-  "version": "3.15.1",
+  "version": "3.16.1",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "lint:fix": "eslint \"src/**/*.ts\" --fix",

package/src/apps/cli/commands/project/setup/setupAgents.ts

@@ -2,6 +2,7 @@ import type { CommandInstance } from "vorpal";
 import { doGitlabRequest, getProjectInfo } from "../../../../../utils/gitlab";
 import { getProjectConfig } from "../../../../../config/getProjectConfig";
 import { getGitRemoteHostAndPath } from "../../../../../git/gitProjectInformation";
+import { getMainBranch } from "../../../../../git";
 import type { AgentConfig } from "@catladder/pipeline";
 
 type TriggerToken = {
@@ -133,7 +134,8 @@ const setupAgentWebhook = async (
 ): Promise<Webhook> => {
   const webhookName = `cl_agent_${agentName}_webhook`;
   const { gitRemoteHost } = await getGitRemoteHostAndPath();
-  const webhookUrl = `https://${gitRemoteHost}/api/v4/projects/${projectId}/ref/main/trigger/pipeline?token=${triggerToken}`;
+  const mainBranch = await getMainBranch();
+  const webhookUrl = `https://${gitRemoteHost}/api/v4/projects/${projectId}/ref/${mainBranch}/trigger/pipeline?token=${triggerToken}`;
 
   instance.log(`Setting up webhook for agent: ${agentName}`);
 
@@ -179,11 +181,13 @@ const setupAgentWebhook = async (
       merge_request_title: "{{merge_request.title}}",
       merge_request_source_branch: "{{merge_request.source_branch}}",
       merge_request_time_estimate: "{{merge_request.time_estimate}}",
+      // FIXME: may cause issues with gitlab webhooks when there are double quotes in the description
       //merge_request_description: "{{merge_request.description}}",
       merge_request_merge_status: "{{merge_request.merge_status}}",
       merge_request_last_commit_title: "{{merge_request.last_commit.title}}",
-      merge_request_last_commit_message:
-        "{{merge_request.last_commit.message}}",
+      // FIXME: may cause issues with gitlab webhooks when there are double quotes in the message
+      //merge_request_last_commit_message:
+      //  "{{merge_request.last_commit.message}}",
       merge_request_last_commit_author_name:
         "{{merge_request.last_commit.author.name}}",
       merge_request_last_commit_author_email:

package/src/git/getGetMainBranch.ts

@@ -0,0 +1,5 @@
+import { exec } from "child-process-promise";
+export const getMainBranch = async () => {
+  const { stdout } = await exec("git rev-parse --abbrev-ref HEAD");
+  return stdout.trim();
+};

package/src/git/index.ts

@@ -1,2 +1,3 @@
 export * from "./gitConfig";
 export * from "./gitProjectInformation";
+export * from "./getGetMainBranch";