Automerge not happening during automergeSchedule if updateNotScheduled: false

[felipecrs]

How are you running Renovate?

Self-hosted Renovate

If you're self-hosting Renovate, tell us which platform (GitHub, GitLab, etc) and which version of Renovate.

Gerrit

Please tell us more about your question or problem

As the title says, automerge is not happening during automergeSchedule if updateNotScheduled: false and not within schedule.

In such situation, Renovate will enter in this code path:

renovate/lib/workers/repository/update/branch/index.ts

Line 330 in 1f4790c

logger.debug('Skipping branch update as not within schedule');

And thus will return before giving checkAutoMerge a chance.

I am currently working around this issue by calling checkAutoMerge within that code path:

      if (config.updateNotScheduled === false && !config.rebaseRequested) {
        logger.debug('Skipping branch update as not within schedule');

        // starts here
        if (config.automerge && branchPr) {
          logger.debug('PR is configured for automerge');
          // skip automerge if there is a new commit since status checks aren't done yet
          if (config.ignoreTests === true || !commitSha) {
            logger.debug('checking auto-merge');
            const prAutomergeResult = await checkAutoMerge(branchPr, config);
            if (prAutomergeResult?.automerged) {
              return {
                branchExists,
                result: 'automerged',
                commitSha,
              };
            }
          }
        } else {
          logger.debug('PR is not configured for automerge');
        }
        // ends here

        return {
          branchExists,
          prNo: branchPr?.number,
          result: 'update-not-scheduled',
        };
      }

Which is copied from:

renovate/lib/workers/repository/update/branch/index.ts

Lines 910 to 926 in 1f4790c

	if (config.automerge) {
	logger.debug('PR is configured for automerge');
	// skip automerge if there is a new commit since status checks aren't done yet
	if (config.ignoreTests === true || !commitSha) {
	logger.debug('checking auto-merge');
	const prAutomergeResult = await checkAutoMerge(pr, config);
	if (prAutomergeResult?.automerged) {
	return {
	branchExists,
	result: 'automerged',
	commitSha,
	};
	}
	}
	} else {
	logger.debug('PR is not configured for automerge');
	}

.

But it's probably not the best solution.

I believe this is a bug, i.e. I believe automerges should not be stopped by updateNotSchedule: false.

What do you think?

Logs (if relevant)

Not relevant, I think.

[rarkins]

Converted to issue #33770