diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e92c0d9..58cd5e10 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -209,7 +209,8 @@ test:live:setup: when: always - if: $CI_COMMIT_BRANCH == "next" || $CI_COMMIT_BRANCH =~ /^pr-[0-9]+$/ when: manual - needs: [] + needs: + - build allow_failure: false variables: GITLAB_PERSONAL_ACCESS_TOKEN: gitbeaker diff --git a/packages/core/src/resources/CommitDiscussions.ts b/packages/core/src/resources/CommitDiscussions.ts index d7b72511..1e7b8e26 100644 --- a/packages/core/src/resources/CommitDiscussions.ts +++ b/packages/core/src/resources/CommitDiscussions.ts @@ -8,7 +8,7 @@ import type { Sudo, } from '../infrastructure'; import type { - DiscussionNotePositionSchema, + DiscussionNotePositionOptions, DiscussionNoteSchema, DiscussionSchema, } from '../templates/ResourceDiscussions'; @@ -34,7 +34,7 @@ export interface CommitDiscussions extends ResourceDi commitId: number, body: string, options?: { - position?: DiscussionNotePositionSchema; + position?: DiscussionNotePositionOptions; commitId?: string; createdAt?: string; } & Sudo & diff --git a/packages/core/src/resources/MergeRequestDiscussions.ts b/packages/core/src/resources/MergeRequestDiscussions.ts index 49ab3b09..42b4bd11 100644 --- a/packages/core/src/resources/MergeRequestDiscussions.ts +++ b/packages/core/src/resources/MergeRequestDiscussions.ts @@ -1,6 +1,7 @@ import type { BaseResourceOptions } from '@gitbeaker/requester-utils'; import { ResourceDiscussions } from '../templates'; import type { + DiscussionNotePositionOptions, DiscussionNotePositionSchema, DiscussionNoteSchema, DiscussionSchema, @@ -21,14 +22,14 @@ export interface MergeRequestDiscussionNoteSchema extends DiscussionNoteSchema { position?: DiscussionNotePositionSchema; } -export type DiscussionNotePositionOptions = DiscussionNotePositionSchema & { - line_range?: { +export type MergeRequestDiscussionNotePositionOptions = DiscussionNotePositionOptions & { + lineRange?: { start?: { - line_code: string; + lineCode: string; type: 'new' | 'old'; }; end?: { - line_code: string; + lineCode: string; type: 'new' | 'old'; }; };