new option: SQUASH_MERGE_REQUEST (#22)

Author: pepakriz

README.md

@@ -49,4 +49,5 @@ GITLAB_AUTH_TOKEN="<token>" yarn run start
 | `GITLAB_AUTH_TOKEN` |  | `required` Your GitLab token |
 | `CI_CHECK_INTERVAL` | `10` | Time between CI checks (in seconds) |
 | `MR_CHECK_INTERVAL` | `20` | Time between merge-requests checks (in seconds) |
-| `REMOVE_BRANCH_AFTER_MERGE` | `true` | It marks MR to be removed after merge |
+| `REMOVE_BRANCH_AFTER_MERGE` | `true` | It'll remove branch after merge |
+| `SQUASH_MERGE_REQUEST` | `true` | It'll squash commits on merge |

src/MergeRequestAcceptor.ts

@@ -68,6 +68,8 @@ type AcceptMergeRequestResult = SuccessResponse
 
 interface AcceptMergeRequestOptions {
 	ciInterval: number;
+	removeBranchAfterMerge: boolean;
+	squashMergeRequest: boolean;
 }
 
 export enum BotLabels {
@@ -211,10 +213,12 @@ export const acceptMergeRequest = async (gitlabApi: GitlabApi, mergeRequest: Mer
 
 		console.log('[MR] Calling merge request');
 		const response = await gitlabApi.sendRawRequest(`/api/v4/projects/${mergeRequest.project_id}/merge_requests/${mergeRequest.iid}/merge`, RequestMethod.Put, {
-			should_remove_source_branch: true,
+			should_remove_source_branch: options.removeBranchAfterMerge,
 			merge_when_pipeline_succeeds: true,
 			sha: mergeRequestInfo.diff_refs.head_sha,
+			squash: options.squashMergeRequest,
 			squash_commit_message: `${mergeRequest.title} (!${mergeRequest.iid})`,
+			merge_commit_message: `${mergeRequest.title} (!${mergeRequest.iid})`,
 		});
 
 		if (response.status === 405) { // cannot be merged

src/index.ts

@@ -17,6 +17,7 @@ const GITLAB_AUTH_TOKEN = env.get('GITLAB_AUTH_TOKEN').required().asString();
 const CI_CHECK_INTERVAL = env.get('CI_CHECK_INTERVAL', '10').asIntPositive() * 1000;
 const MR_CHECK_INTERVAL = env.get('MR_CHECK_INTERVAL', '20').asIntPositive() * 1000;
 const REMOVE_BRANCH_AFTER_MERGE = env.get('REMOVE_BRANCH_AFTER_MERGE', 'true').asBoolStrict();
+const SQUASH_MERGE_REQUEST = env.get('SQUASH_MERGE_REQUEST', 'true').asBoolStrict();
 
 const gitlabApi = new GitlabApi(GITLAB_URL, GITLAB_AUTH_TOKEN);
 const worker = new Worker();
@@ -25,14 +26,6 @@ const runMergeRequestCheckerLoop = async (user: User) => {
 	console.log('[bot] Checking assigned merge requests');
 	const assignedMergeRequests = await gitlabApi.getAssignedOpenedMergeRequests();
 	const possibleToAcceptMergeRequests = assignedMergeRequests.map(async (mergeRequest: MergeRequest) => {
-		if (REMOVE_BRANCH_AFTER_MERGE && !mergeRequest.force_remove_source_branch) {
-			console.log(`[MR] Marking MR to be squashed and branch removed after merge`);
-			await gitlabApi.updateMergeRequest(mergeRequest.project_id, mergeRequest.iid, {
-				remove_source_branch: true,
-				squash: true,
-			});
-		}
-
 		if (mergeRequest.merge_status !== MergeStatus.CanBeMerged) {
 			console.log(`[MR] Branch cannot be merged. Probably it needs rebase to target branch, assigning back`);
 
@@ -92,6 +85,8 @@ const runMergeRequestCheckerLoop = async (user: User) => {
 				jobId,
 				() => acceptMergeRequest(gitlabApi, mergeRequest, user, {
 					ciInterval: CI_CHECK_INTERVAL,
+					removeBranchAfterMerge: REMOVE_BRANCH_AFTER_MERGE,
+					squashMergeRequest: SQUASH_MERGE_REQUEST,
 				}),
 			);