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

feat(platform): re-attempt platform automerge on github and gitlab #26567

Merged
merged 26 commits into from Mar 18, 2024
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
77dfd20
feat(platform/github): re-attempt platform automerge
straub Jan 9, 2024
46f0aaa
Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge
straub Jan 9, 2024
5667cf4
refactor(platform/github): use a new function, reattemptPlatformAutom…
straub Jan 10, 2024
206bdf9
refactor(platform/github): less renaming
straub Jan 10, 2024
967e9bb
docs(platformAutomerge): address new GitHub Merge Queue behavior
straub Jan 10, 2024
c69d58e
docs(platformAutomerge): rm extra blank line
straub Jan 10, 2024
d5591ca
Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge
straub Jan 10, 2024
f3417d0
docs(platformAutomerge): fix typo
straub Jan 10, 2024
aa59178
fix(platform/github): correct inconsistent log message
straub Jan 10, 2024
318b7c2
refactor(platform/github): number -> prNo
straub Jan 10, 2024
e2515dd
refactor(workers/repository/update/branch): add boolean checks from t…
straub Jan 11, 2024
fafbc3a
fix(workers/repository/update/branch): use optional chaining on platf…
straub Jan 11, 2024
3023529
fix(workers/repository/update/branch): rm config.autoMergeAllowed che…
straub Jan 11, 2024
89227b7
Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge
straub Jan 11, 2024
5de6b57
perf(platform/github): fetch PR from cache in reattemptPlatformAutomerge
straub Jan 16, 2024
e62dac6
Update lib/modules/platform/github/index.ts
viceice Jan 17, 2024
89b9f94
Update lib/modules/platform/github/index.ts
viceice Jan 17, 2024
1f6fb0a
Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge
viceice Jan 17, 2024
3eb4a39
Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge
straub Feb 29, 2024
5da6078
test(platform/github): add restGetPrList to mocks
straub Feb 29, 2024
2d9d267
Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge
straub Mar 7, 2024
1d97360
Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge
straub Mar 16, 2024
71550f3
refactor(platform/gitlab): move automerge re-attempt from updatePr to…
straub Mar 16, 2024
d556665
Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge
straub Mar 16, 2024
b4d3419
test(platform/gitlab): resolve coverage issue
straub Mar 16, 2024
aa67c3e
Merge branch 'main' into feat/github-refreshPr-tryPrAutomerge
straub Mar 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions lib/modules/platform/gitlab/index.ts
Expand Up @@ -852,13 +852,9 @@ export async function reattemptPlatformAutomerge({
number: iid,
platformOptions,
}: ReattemptPlatformAutomergeConfig): Promise<void> {
try {
await tryPrAutomerge(iid, platformOptions);
await tryPrAutomerge(iid, platformOptions);
straub marked this conversation as resolved.
Show resolved Hide resolved

logger.debug(`PR platform automerge re-attempted...prNo: ${iid}`);
} catch (err) {
logger.warn({ err }, 'Error re-attempting PR platform automerge');
}
logger.debug(`PR platform automerge re-attempted...prNo: ${iid}`);
}

export async function mergePr({ id }: MergePRConfig): Promise<boolean> {
Expand Down