Use MergeRequestDiscussions.resolve

Author: Jiří Fencl

src/comment.ts

@@ -251,7 +251,6 @@ export const comment = async () => {
     CI_MERGE_REQUEST_TITLE,
     GITLAB_COMMENT_TYPE,
     GITLAB_COMMENT_DISCUSSION_AUTORESOLVE,
-    GITLAB_COMMENT_DISCUSSION_AUTORESOLVE_ONLY_CHANGESET_EXISTS,
     GITLAB_ADD_CHANGESET_MESSAGE,
   } = env
 
@@ -314,14 +313,26 @@ export const comment = async () => {
     switch (GITLAB_COMMENT_TYPE) {
       case 'discussion': {
         if (noteInfo) {
+          if (
+            GITLAB_COMMENT_DISCUSSION_AUTORESOLVE === 'always' ||
+            (GITLAB_COMMENT_DISCUSSION_AUTORESOLVE === 'hasChangeset' &&
+              hasChangeset)
+          ) {
+            await api.MergeRequestDiscussions.resolve(
+              context.projectId,
+              mrIid,
+              noteInfo.discussionId,
+              true,
+            )
+          }
+
           return api.MergeRequestDiscussions.editNote(
             context.projectId,
             mrIid,
             noteInfo.discussionId,
             noteInfo.noteId,
             {
               body: prComment,
-              resolved: GITLAB_COMMENT_DISCUSSION_AUTORESOLVE === 'always' || (GITLAB_COMMENT_DISCUSSION_AUTORESOLVE === 'hasChangeset' && hasChangeset),
             },
           )
         }

src/types.ts

@@ -20,7 +20,9 @@ export type Env = GitLabCIPredefinedVariables &
     GITLAB_CI_USER_NAME?: string
     GITLAB_CI_USER_EMAIL: string
     GITLAB_COMMENT_TYPE: LooseString<'discussion' | 'note'>
-    GITLAB_COMMENT_DISCUSSION_AUTORESOLVE: LooseString<'always' | 'hasChangeset'>
+    GITLAB_COMMENT_DISCUSSION_AUTORESOLVE: LooseString<
+      'always' | 'hasChangeset'
+    >
     GITLAB_ADD_CHANGESET_MESSAGE?: string
     DEBUG_GITLAB_CREDENTIAL: LooseString<'1' | 'true'>