Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(gerrit): not auto-merging if Code-Review changed from +2 to +1 #32818

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
46f8eed
fix(gerrit): not auto-approving if change already had a Code-Review +1
felipecrs Nov 29, 2024
107a298
chore(gerrit): improve auto-approve on new patchset workaround
felipecrs Nov 30, 2024
6ac7b9e
chore(gerrit): try auto-approve right before auto-merge
felipecrs Nov 30, 2024
6ffa5b6
Merge branch 'main' into fix-auto-merge-if-plus-one
felipecrs Nov 30, 2024
7877331
Merge branch 'main' of https://github.com/renovatebot/renovate into f…
felipecrs Dec 1, 2024
1d8daf5
test(gerrit): fix approvePr coverage
felipecrs Dec 1, 2024
5eb2846
chore(gerrit): still approve if change was approved another user
felipecrs Dec 1, 2024
c679c28
feat(gitlab,azure): try approving before auto-merge
felipecrs Dec 1, 2024
dbdf41a
chore: add better jsdoc for approvePr
felipecrs Dec 1, 2024
bd05816
test(gerrit): fix lint in client.spec.ts
felipecrs Dec 1, 2024
ac30f2b
test(automerge): add test for auto approve before merging
felipecrs Dec 1, 2024
539c12f
Merge branch 'main' into fix-auto-merge-if-plus-one
felipecrs Dec 2, 2024
7923d5b
Revert "feat(gitlab,azure): try approving before auto-merge"
felipecrs Dec 2, 2024
c4c81e3
chore: rename approvePr to approvePrForAutomerge
felipecrs Dec 2, 2024
4dfc817
Revert "chore(gerrit): still approve if change was approved another u…
felipecrs Dec 2, 2024
bb317ce
chore(gerrit): improve approve method to avoid some API calls
felipecrs Dec 2, 2024
b1ce02b
Merge branch 'main' of https://github.com/renovatebot/renovate into f…
felipecrs Dec 2, 2024
53743b2
chore: fix type import
felipecrs Dec 2, 2024
e0b6f8d
chore: remove spurious comment
felipecrs Dec 2, 2024
74137a8
Merge branch 'main' of https://github.com/renovatebot/renovate into f…
felipecrs Dec 29, 2024
b93ee7a
Address review comments
felipecrs Dec 29, 2024
add6ca5
Add tests for approvePrForAutomerge
felipecrs Dec 29, 2024
933f13d
Merge
felipecrs Jan 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: fix type import
  • Loading branch information
felipecrs committed Dec 2, 2024
commit 53743b27bf837fe8109639872944a5b0d5906d22
10 changes: 5 additions & 5 deletions lib/modules/platform/gerrit/client.spec.ts
Original file line number Diff line number Diff line change
@@ -4,11 +4,11 @@ import { REPOSITORY_ARCHIVED } from '../../../constants/error-messages';
import { setBaseUrl } from '../../../util/http/gerrit';
import type { FindPRConfig } from '../types';
import { client } from './client';
import {
type GerritChange,
type GerritChangeMessageInfo,
type GerritFindPRConfig,
type GerritMergeableInfo,
import type {
GerritChange,
GerritChangeMessageInfo,
GerritFindPRConfig,
GerritMergeableInfo,
} from './types';

const gerritEndpointUrl = 'https://dev.gerrit.com/renovate/';