File tree Expand file tree Collapse file tree 2 files changed +4
-2
lines changed
.github/local-actions/branch-manager
ng-dev/pr/merge/strategies Expand file tree Collapse file tree 2 files changed +4
-2
lines changed Original file line number Diff line number Diff line change @@ -70128,7 +70128,7 @@ var AutosquashMergeStrategy = class extends MergeStrategy {
70128
70128
this.pushTargetBranchesUpstream(targetBranches);
70129
70129
const localBranch = this.getLocalTargetBranchName(githubTargetBranch);
70130
70130
const sha = this.git.run(["rev-parse", localBranch]).stdout.trim();
70131
- await new Promise((resolve) => setTimeout(resolve, 5e3 ));
70131
+ await new Promise((resolve) => setTimeout(resolve, parseInt(process.env["AUTOSQUASH_TIMEOUT"] || "0") ));
70132
70132
await this.git.github.issues.createComment({
70133
70133
...this.git.remoteParams,
70134
70134
issue_number: pullRequest.prNumber,
Original file line number Diff line number Diff line change @@ -78,7 +78,9 @@ export class AutosquashMergeStrategy extends MergeStrategy {
78
78
/** The SHA of the commit pushed to github which represents closing the PR. */
79
79
const sha = this . git . run ( [ 'rev-parse' , localBranch ] ) . stdout . trim ( ) ;
80
80
// Wait five seconds to account for rate limiting of the token usage during merge.
81
- await new Promise ( ( resolve ) => setTimeout ( resolve , 5000 ) ) ;
81
+ await new Promise ( ( resolve ) =>
82
+ setTimeout ( resolve , parseInt ( process . env [ 'AUTOSQUASH_TIMEOUT' ] || '0' ) ) ,
83
+ ) ;
82
84
// Github automatically closes PRs whose commits are merged into the main branch on Github.
83
85
// However, it does not note them as merged using the purple merge badge as occurs when done via
84
86
// the UI. To inform users that the PR was in fact merged, add a comment expressing the fact
You can’t perform that action at this time.
0 commit comments